From 2c6a123595f23e45f08cffd8028965117ff2e8a8 Mon Sep 17 00:00:00 2001 From: nealgao Date: Mon, 19 Nov 2018 13:18:29 -0800 Subject: [PATCH] reenable basic sample tests, serially after frontend integ tests(triggering 5 times, successful always) (#298) * reenable basic sample tests, serially after frontend integ tests * fix namespace bug --- test/e2e_test_gke.yaml | 141 +++++++++++++++++------------------ test/sample-test/run_test.sh | 16 ++-- 2 files changed, 78 insertions(+), 79 deletions(-) diff --git a/test/e2e_test_gke.yaml b/test/e2e_test_gke.yaml index e0f7b25959f..bb95f435a35 100644 --- a/test/e2e_test_gke.yaml +++ b/test/e2e_test_gke.yaml @@ -128,77 +128,76 @@ 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 -# 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: namespace -# value: "{{inputs.parameters.namespace}}" -# - 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: namespace -# value: "{{inputs.parameters.namespace}}" -# - 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: namespace -# value: "{{inputs.parameters.namespace}}" -# - 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: namespace -# value: "{{inputs.parameters.namespace}}" -# - 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: namespace -# value: "{{inputs.parameters.namespace}}" -# - name: test-name -# value: "paralleljoin" + - - 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: namespace + value: "{{inputs.parameters.namespace}}" + - 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: namespace + value: "{{inputs.parameters.namespace}}" + - 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: namespace + value: "{{inputs.parameters.namespace}}" + - 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: namespace + value: "{{inputs.parameters.namespace}}" + - 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: namespace + value: "{{inputs.parameters.namespace}}" + - name: test-name + value: "paralleljoin" - name: get-project script: diff --git a/test/sample-test/run_test.sh b/test/sample-test/run_test.sh index 401b0eeec19..a5d585fc5f2 100755 --- a/test/sample-test/run_test.sh +++ b/test/sample-test/run_test.sh @@ -154,7 +154,7 @@ if [ "$TEST_NAME" == 'tf-training' ]; then dsl-compile --py kubeflow-training-classification.py --output kubeflow-training-classification.tar.gz cd / - python3 run_kubeflow_test.py --input ${BASE_DIR}/samples/kubeflow-tf/kubeflow-training-classification.tar.gz --result $SAMPLE_KUBEFLOW_TEST_RESULT --output $SAMPLE_KUBEFLOW_TEST_OUTPUT --namespace namespace + python3 run_kubeflow_test.py --input ${BASE_DIR}/samples/kubeflow-tf/kubeflow-training-classification.tar.gz --result $SAMPLE_KUBEFLOW_TEST_RESULT --output $SAMPLE_KUBEFLOW_TEST_OUTPUT --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_KUBEFLOW_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_KUBEFLOW_TEST_RESULT} @@ -174,7 +174,7 @@ elif [ "$TEST_NAME" == "tfx" ]; then dsl-compile --py taxi-cab-classification-pipeline.py --output taxi-cab-classification-pipeline.tar.gz cd / - python3 run_tfx_test.py --input ${BASE_DIR}/samples/tfx/taxi-cab-classification-pipeline.tar.gz --result $SAMPLE_TFX_TEST_RESULT --output $SAMPLE_TFX_TEST_OUTPUT --namespace namespace + python3 run_tfx_test.py --input ${BASE_DIR}/samples/tfx/taxi-cab-classification-pipeline.tar.gz --result $SAMPLE_TFX_TEST_RESULT --output $SAMPLE_TFX_TEST_OUTPUT --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_TFX_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_TFX_TEST_RESULT} elif [ "$TEST_NAME" == "sequential" ]; then @@ -186,7 +186,7 @@ elif [ "$TEST_NAME" == "sequential" ]; then dsl-compile --py sequential.py --output sequential.tar.gz cd / - python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/sequential.tar.gz --result $SAMPLE_SEQUENTIAL_TEST_RESULT --output $SAMPLE_SEQUENTIAL_TEST_OUTPUT --testname sequential --namespace namespace + python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/sequential.tar.gz --result $SAMPLE_SEQUENTIAL_TEST_RESULT --output $SAMPLE_SEQUENTIAL_TEST_OUTPUT --testname sequential --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_SEQUENTIAL_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_SEQUENTIAL_TEST_RESULT} @@ -199,7 +199,7 @@ elif [ "$TEST_NAME" == "condition" ]; then dsl-compile --py condition.py --output condition.tar.gz cd / - python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/condition.tar.gz --result $SAMPLE_CONDITION_TEST_RESULT --output $SAMPLE_CONDITION_TEST_OUTPUT --testname condition --namespace namespace + python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/condition.tar.gz --result $SAMPLE_CONDITION_TEST_RESULT --output $SAMPLE_CONDITION_TEST_OUTPUT --testname condition --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_CONDITION_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_CONDITION_TEST_RESULT} @@ -212,7 +212,7 @@ elif [ "$TEST_NAME" == "exithandler" ]; then dsl-compile --py exit_handler.py --output exit_handler.tar.gz cd / - python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/exit_handler.tar.gz --result $SAMPLE_EXIT_HANDLER_TEST_RESULT --output $SAMPLE_EXIT_HANDLER_TEST_OUTPUT --testname exithandler --namespace namespace + python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/exit_handler.tar.gz --result $SAMPLE_EXIT_HANDLER_TEST_RESULT --output $SAMPLE_EXIT_HANDLER_TEST_OUTPUT --testname exithandler --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_EXIT_HANDLER_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_EXIT_HANDLER_TEST_RESULT} @@ -225,7 +225,7 @@ elif [ "$TEST_NAME" == "immediatevalue" ]; then dsl-compile --py immediate_value.py --output immediate_value.tar.gz cd / - python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/immediate_value.tar.gz --result $SAMPLE_IMMEDIATE_VALUE_TEST_RESULT --output $SAMPLE_IMMEDIATE_VALUE_TEST_OUTPUT --testname immediatevalue --namespace namespace + python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/immediate_value.tar.gz --result $SAMPLE_IMMEDIATE_VALUE_TEST_RESULT --output $SAMPLE_IMMEDIATE_VALUE_TEST_OUTPUT --testname immediatevalue --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_IMMEDIATE_VALUE_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_IMMEDIATE_VALUE_TEST_RESULT} @@ -238,7 +238,7 @@ elif [ "$TEST_NAME" == "paralleljoin" ]; then dsl-compile --py parallel_join.py --output parallel_join.tar.gz cd / - python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/parallel_join.tar.gz --result $SAMPLE_PARALLEL_JOIN_TEST_RESULT --output $SAMPLE_PARALLEL_JOIN_TEST_OUTPUT --testname paralleljoin --namespace namespace + python3 run_basic_test.py --input ${BASE_DIR}/samples/basic/parallel_join.tar.gz --result $SAMPLE_PARALLEL_JOIN_TEST_RESULT --output $SAMPLE_PARALLEL_JOIN_TEST_OUTPUT --testname paralleljoin --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_PARALLEL_JOIN_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_PARALLEL_JOIN_TEST_RESULT} @@ -261,7 +261,7 @@ elif [ "$TEST_NAME" == "xgboost" ]; then dsl-compile --py xgboost-training-cm.py --output xgboost-training-cm.tar.gz cd / - python3 run_xgboost_test.py --input ${BASE_DIR}/samples/xgboost-spark/xgboost-training-cm.tar.gz --result $SAMPLE_XGBOOST_TEST_RESULT --output $SAMPLE_XGBOOST_TEST_OUTPUT --namespace namespace + python3 run_xgboost_test.py --input ${BASE_DIR}/samples/xgboost-spark/xgboost-training-cm.tar.gz --result $SAMPLE_XGBOOST_TEST_RESULT --output $SAMPLE_XGBOOST_TEST_OUTPUT --namespace ${NAMESPACE} echo "Copy the test results to GCS ${RESULTS_GCS_DIR}/" gsutil cp ${SAMPLE_XGBOOST_TEST_RESULT} ${RESULTS_GCS_DIR}/${SAMPLE_XGBOOST_TEST_RESULT}