Address nit and fix bug

kubernetes · Aug 16, 2016 · a9cf727 · a9cf727
1 parent 7a393f5
commit a9cf727
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/test/e2e_node/gubernator.sh b/test/e2e_node/gubernator.sh
@@ -26,7 +26,7 @@ source cluster/lib/logging.sh
 
 
 if [[ $# -eq 0 || ! $1 =~ ^[Yy]$ ]]; then
-  read -p "Do you want to run gubernator.sh and upload logs to GCS? [y/n]" yn
+  read -p "Do you want to run gubernator.sh and upload logs publicly to GCS? [y/n]" yn
   echo
   if [[ ! $yn =~ ^[Yy]$ ]]; then
       exit 1
@@ -74,11 +74,6 @@ if [[ ! -e $BUILD_LOG_PATH ]]; then
   exit 1
 fi
 
-results=$(find ${ARTIFACTS} -type d -name "results")
-if [[ $results != "" && $results != "${ARTIFACTS}/results" ]]; then
-  mv $results $ARTIFACTS
-fi
-
 # Get start and end timestamps based on build-log.txt file contents
 # Line where the actual tests start
 start_line=$(grep -n -m 1 "^=" ${BUILD_LOG_PATH} | sed 's/\([0-9]*\).*/\1/')
@@ -110,6 +105,10 @@ if gsutil ls "${GCS_JOBS_PATH}" | grep -q "${BUILD_STAMP}"; then
   exit
 fi
 
+results=$(find ${ARTIFACTS} -type d -name "results")
+if [[ $results != "" && $results != "${ARTIFACTS}/results" && $results != $ARTIFACTS ]]; then
+  mv $results $ARTIFACTS
+fi
 
 # Upload log files
 for upload_attempt in $(seq 3); do

diff --git a/test/e2e_node/runner/run_e2e.go b/test/e2e_node/runner/run_e2e.go
@@ -263,11 +263,11 @@ func callGubernator(gubernator bool) {
 		if err != nil {
 			fmt.Println("gubernator.sh Failed")
 			fmt.Println(err)
-	        return
-	    }
-        fmt.Printf("%s", output)
-    }
-    return 
+			return
+		}
+		fmt.Printf("%s", output)
+	}
+	return
 }
 
 func (a *Archive) getArchive() (string, error) {