Merge 38b6cdc into 36dc868

kubeflow · Nov 15, 2018 · 383b69d · 383b69d
2 parents 36dc868 + 38b6cdc
commit 383b69d
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 62 deletions.
diff --git a/ml-pipeline/deploy.sh b/ml-pipeline/deploy.sh
@@ -166,7 +166,7 @@ if [ "$WITH_KUBEFLOW" = true ]; then
   if [[ ${REPORT_USAGE} != "true" ]]; then
       (cd ${KUBEFLOW_REPO} && sed -i -e 's/--reportUsage\=true/--reportUsage\=false/g' scripts/util.sh)
   fi
-  (${KUBEFLOW_REPO}/scripts/kfctl.sh init ${KFAPP} --platform none)
+  (${KUBEFLOW_REPO}/scripts/kfctl.sh init ${KFAPP} --platform gcp)
   (cd ${KFAPP} && ${KUBEFLOW_REPO}/scripts/kfctl.sh generate k8s && ${KUBEFLOW_REPO}/scripts/kfctl.sh apply k8s)
 fi
 

diff --git a/test/e2e_test_gke.yaml b/test/e2e_test_gke.yaml
@@ -125,66 +125,67 @@ spec:
         #TODO: Uncomment to disable the test on Minikube
         #TODO: Change the cluster-type to "minikube" once https://github.com/kubeflow/pipelines/pull/1285 and related PRs are merged.
         #when: "{{workflow.parameters.cluster-type}} != none" #Do not run the test on Minikube
-      - name: run-condition-tests
-        template: run-basic-e2e-tests
-        arguments:
-          parameters:
-          - name: commit-sha
-            value: "{{inputs.parameters.commit-sha}}"
-          - name: test-results-gcs-dir
-            value: "{{inputs.parameters.test-results-gcs-dir}}"
-          - name: sample-tests-image
-            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
-          - name: test-name
-            value: "condition"
-      - name: run-exit-handler-tests
-        template: run-basic-e2e-tests
-        arguments:
-          parameters:
-          - name: commit-sha
-            value: "{{inputs.parameters.commit-sha}}"
-          - name: test-results-gcs-dir
-            value: "{{inputs.parameters.test-results-gcs-dir}}"
-          - name: sample-tests-image
-            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
-          - name: test-name
-            value: "exithandler"
-      - name: run-sequential-tests
-        template: run-basic-e2e-tests
-        arguments:
-          parameters:
-          - name: commit-sha
-            value: "{{inputs.parameters.commit-sha}}"
-          - name: test-results-gcs-dir
-            value: "{{inputs.parameters.test-results-gcs-dir}}"
-          - name: sample-tests-image
-            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
-          - name: test-name
-            value: "sequential"
-      - name: run-immediate-value-tests
-        template: run-basic-e2e-tests
-        arguments:
-          parameters:
-          - name: commit-sha
-            value: "{{inputs.parameters.commit-sha}}"
-          - name: test-results-gcs-dir
-            value: "{{inputs.parameters.test-results-gcs-dir}}"
-          - name: sample-tests-image
-            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
-          - name: test-name
-            value: "immediatevalue"
-      - name: run-parallel-join-tests
-        template: run-basic-e2e-tests
-        arguments:
-          parameters:
-          - name: commit-sha
-            value: "{{inputs.parameters.commit-sha}}"
-          - name: test-results-gcs-dir
-            value: "{{inputs.parameters.test-results-gcs-dir}}"
-          - name: sample-tests-image
-            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
-          - name: test-name
-            value: "paralleljoin"
+#        TODO: Re-enable when https://github.com/kubeflow/pipelines/issues/272 is clear
+#      - name: run-condition-tests
+#        template: run-basic-e2e-tests
+#        arguments:
+#          parameters:
+#          - name: commit-sha
+#            value: "{{inputs.parameters.commit-sha}}"
+#          - name: test-results-gcs-dir
+#            value: "{{inputs.parameters.test-results-gcs-dir}}"
+#          - name: sample-tests-image
+#            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
+#          - name: test-name
+#            value: "condition"
+#      - name: run-exit-handler-tests
+#        template: run-basic-e2e-tests
+#        arguments:
+#          parameters:
+#          - name: commit-sha
+#            value: "{{inputs.parameters.commit-sha}}"
+#          - name: test-results-gcs-dir
+#            value: "{{inputs.parameters.test-results-gcs-dir}}"
+#          - name: sample-tests-image
+#            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
+#          - name: test-name
+#            value: "exithandler"
+#      - name: run-sequential-tests
+#        template: run-basic-e2e-tests
+#        arguments:
+#          parameters:
+#          - name: commit-sha
+#            value: "{{inputs.parameters.commit-sha}}"
+#          - name: test-results-gcs-dir
+#            value: "{{inputs.parameters.test-results-gcs-dir}}"
+#          - name: sample-tests-image
+#            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
+#          - name: test-name
+#            value: "sequential"
+#      - name: run-immediate-value-tests
+#        template: run-basic-e2e-tests
+#        arguments:
+#          parameters:
+#          - name: commit-sha
+#            value: "{{inputs.parameters.commit-sha}}"
+#          - name: test-results-gcs-dir
+#            value: "{{inputs.parameters.test-results-gcs-dir}}"
+#          - name: sample-tests-image
+#            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
+#          - name: test-name
+#            value: "immediatevalue"
+#      - name: run-parallel-join-tests
+#        template: run-basic-e2e-tests
+#        arguments:
+#          parameters:
+#          - name: commit-sha
+#            value: "{{inputs.parameters.commit-sha}}"
+#          - name: test-results-gcs-dir
+#            value: "{{inputs.parameters.test-results-gcs-dir}}"
+#          - name: sample-tests-image
+#            value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.basic-e2e-tests-image-suffix}}"
+#          - name: test-name
+#            value: "paralleljoin"
 
   - name: get-project
     script:

diff --git a/test/presubmit-tests.sh b/test/presubmit-tests.sh
@@ -80,7 +80,7 @@ if [ "$CLUSTER_TYPE" == "create-gke" ]; then
     echo "Delete cluster..."
     gcloud container clusters delete ${TEST_CLUSTER} --async
   }
-  trap delete_cluster EXIT
+  # trap delete_cluster EXIT
 
   gcloud config set project ml-pipeline-test
   gcloud config set compute/zone us-central1-a