some little changes to test github->jenkins

AlicTsai · Feb 20, 2014 · 62d045b · 62d045b
1 parent 41892d4
commit 62d045b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/get_s3_jar.sh b/get_s3_jar.sh
@@ -84,9 +84,10 @@ echo "target/h2o-sources.jar is not touched, so it is out-of-step (but not used)
 # look at some stuff
 ls -ltr ./latest_h2o_jar_version
 cat ./latest_h2o_jar_version
-ls -ltr ./h2o-*$version/h2o.jar 
-ls -ltr target/h2o.jar
-ls -ltr ./h2o-*$version/R/h2o*.tar.gz
 ls -ltr ./h2o-downloaded/R/h2o*.tar.gz
 ls -ltr ./h2o-downloaded/hadoop/h2odriver*.jar
+ls -ltr ./h2o-*$version/h2o.jar 
+ls -ltr ./h2o-*$version/R/h2o*.tar.gz
+ls -ltr target/h2o.jar
+ls -ltr target/R/*
 
diff --git a/py/testdir_release/my_hh.sh → py/testdir_release/my_h2o_on_hadoop.sh b/py/testdir_release/my_hh.sh → py/testdir_release/my_h2o_on_hadoop.sh
@@ -6,6 +6,6 @@ H2O_JAR=../../h2o-downloaded/h2o.jar
 
 hadoop dfs -rmr /user/kevin/hdfsOutputDirName
 
-# first check whether you have mapred permissions?
+echo "You should first check whether you have mapred permissions?"
 hadoop jar $H2O_HADOOP/h2odriver_cdh3.jar water.hadoop.h2odriver -jt $CDH3_JOBTRACKER -libjars $H2O_JAR -mapperXmx 8g -nodes 3 -output hdfsOutputDirName -notify h2o-one-node
 
diff --git a/py/testdir_release/pytest_config-kevin.json b/py/testdir_release/pytest_config-kevin.json
@@ -7,19 +7,27 @@
     "use_home_for_ice": true,
 
     "key_filename": "~/.0xcustomer/0xcustomer_id_rsa",
-    "h2o_per_host": 3, 
-    "java_heap_GB": 40, 
+    "h2o_per_host": 1, 
+    "java_heap_GB": 28, 
 
     "hdfs_name_node": "192.168.1.176",
     "hdfs_version": "cdh3",
     "use_hdfs": true,
 
     "use_flatfile": true,
     "base_port": 54355,
-    "cloud_name": "jenkins-164",
+    "cloud_name": "kevin-172",
 
     "ip": [
-        "192.168.1.164"
+        "192.178.1.172",
+        "192.178.1.173",
+        "192.178.1.174",
+        "192.178.1.175",
+        "192.178.1.176",
+        "192.178.1.177",
+        "192.178.1.178",
+        "192.178.1.179",
+        "192.178.1.180"
     ]
 }
 
diff --git a/py/testdir_release/runner_Runit.sh b/py/testdir_release/runner_Runit.sh
@@ -192,15 +192,10 @@ echo "Showing the H2OWrapperDir env. variable. Is it .../../h2o-downloaded/R?"
 printenv | grep H2OWrapperDir
 
 #autoGen RUnits
-#!/bin/bash
-
 myR ../../R/tests/Utils/runnerSetupPackage 300
-
 # myR ../../R/tests/testdir_munging/histograms/runit_histograms 1200
 
-
 # sleep 3600
-
 # have to ignore the Rsandbox dirs that got created in the tests directory
 for test in $(find ../../R/tests/ | egrep -v 'Utils|Rsandbox' | grep runit | awk '{gsub("\\.[rR]","",$0); print $0}');
 do

diff --git a/py/testdir_release/runner_setup.sh b/py/testdir_release/runner_setup.sh
@@ -42,9 +42,9 @@ do
             echo "test is $TEST"
             ;;
         h)
-            echo "-u will use existing"
-            echo "-n will reuse existing download of h2o stuff from s3"
-            echo "-b <BRANCH> will use that branch for download"
+            echo "-u Use existing target/h2o.jar, target/R/*  and existing downloaded hadoop drivers"
+            echo "-n Init target/* from existing download of h2o stuff from s3 (h2o-downloaded)."
+            echo "-b <BRANCH> Use this branch for any s3 download"
             echo "-d <dir> -t <python test> will run a single test"
             exit
             ;;