fix bunch of issues in prow test (#866)

* update tests * explicit return successful * fix * move variable * Update deploy-kubeflow.sh
kubeflow · Feb 27, 2019 · 18878f1 · 18878f1
1 parent b3dee05
commit 18878f1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/test/check-argo-status.sh b/test/check-argo-status.sh
@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 ARTIFACT_DIR=$WORKSPACE/_artifacts
 WORKFLOW_COMPLETE_KEYWORD="completed=true"
 WORKFLOW_FAILED_KEYWORD="phase=Failed"

diff --git a/test/deploy-kubeflow.sh b/test/deploy-kubeflow.sh
@@ -14,12 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && pwd)"
+set -ex
 
+TEST_CLUSTER_PREFIX=${WORKFLOW_FILE%.*}
+TEST_CLUSTER=$(echo $TEST_CLUSTER_PREFIX | cut -d _ -f 1)-${PULL_BASE_SHA:0:7}-${RANDOM}
 # Install ksonnet
 KS_VERSION="0.13.0"
+
 curl -LO https://github.com/ksonnet/ksonnet/releases/download/v${KS_VERSION}/ks_${KS_VERSION}_linux_amd64.tar.gz
 tar -xzf ks_${KS_VERSION}_linux_amd64.tar.gz
 chmod +x ./ks_${KS_VERSION}_linux_amd64/ks
@@ -49,13 +50,14 @@ KFAPP=${TEST_CLUSTER}
 
 function clean_up {
   echo "Clean up..."
-  cd ${KFAPP}
+  cd ${DIR}/${KFAPP}
   ${KUBEFLOW_SRC}/scripts/kfctl.sh delete all
   # delete the storage
   gcloud deployment-manager --project=${PROJECT} deployments delete ${KFAPP}-storage --quiet
 }
 trap clean_up EXIT SIGINT SIGTERM
 
+cd ${DIR}
 ${KUBEFLOW_SRC}/scripts/kfctl.sh init ${KFAPP} --platform ${PLATFORM} --project ${PROJECT} --skipInitProject
 
 cd ${KFAPP}
@@ -64,4 +66,4 @@ ${KUBEFLOW_SRC}/scripts/kfctl.sh apply platform
 ${KUBEFLOW_SRC}/scripts/kfctl.sh generate k8s
 ${KUBEFLOW_SRC}/scripts/kfctl.sh apply k8s
 
-gcloud container clusters get-credentials ${TEST_CLUSTER}
+gcloud container clusters get-credentials ${TEST_CLUSTER}
diff --git a/test/deploy-pipeline.sh b/test/deploy-pipeline.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -ex
 
 
 usage()
@@ -43,8 +43,7 @@ while [ "$1" != "" ]; do
     shift
 done
 
-cd ${KUBEFLOW_SRC}
-cd ${KFAPP}
+cd ${DIR}/${KFAPP}
 
 ## Update pipeline component image
 pushd ks_app

diff --git a/test/install-argo.sh b/test/install-argo.sh
@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 kubectl config set-context $(kubectl config current-context) --namespace=default
 echo "Add necessary cluster role bindings"
 ACCOUNT=$(gcloud info --format='value(config.account)')

diff --git a/test/postsubmit-tests-with-pipeline-deployment.sh b/test/postsubmit-tests-with-pipeline-deployment.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -ex
 
 usage()
 {
@@ -61,7 +61,7 @@ while [ "$1" != "" ]; do
     shift
 done
 
-#Variables
+# Variables
 # Refer to https://github.com/kubernetes/test-infra/blob/e357ffaaeceafe737bd6ab89d2feff132d92ea50/prow/jobs.md for the Prow job environment variables
 TEST_RESULTS_GCS_DIR=gs://${TEST_RESULT_BUCKET}/${PULL_BASE_SHA}/${TEST_RESULT_FOLDER}
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && pwd)"

diff --git a/test/presubmit-tests-with-pipeline-deployment.sh b/test/presubmit-tests-with-pipeline-deployment.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -ex
 
 usage()
 {

diff --git a/test/test-prep.sh b/test/test-prep.sh
@@ -29,6 +29,3 @@ remote_code_archive_uri="${code_archive_prefix}_${PULL_BASE_SHA}_${date_string}.
 
 tar -czf "$local_code_archive_file" .
 gsutil cp "$local_code_archive_file" "$remote_code_archive_uri"
-
-TEST_CLUSTER_PREFIX=${WORKFLOW_FILE%.*}
-TEST_CLUSTER=$(echo $TEST_CLUSTER_PREFIX | cut -d _ -f 1)-${PULL_BASE_SHA:0:7}-${RANDOM}
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     # See the License for the specific language governing permissions and
     # limitations under the License.
-    set -x
+    set -ex
     usage()
     {
@@ Expand Down @@