Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reenable basic sample tests, serially after frontend integ tests(triggering 5 times, successful always) #298

Merged
merged 3 commits into from
Nov 19, 2018
Merged

reenable basic sample tests, serially after frontend integ tests(triggering 5 times, successful always) #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
009104e
reenable basic sample tests, serially after frontend integ tests
gaoning777 Nov 16, 2018
df20d77
Merge branch 'master' into ngao/reenable-basic-sample-tests
gaoning777 Nov 19, 2018
9fbd7df
fix namespace bug
gaoning777 Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 70 additions & 71 deletions test/e2e_test_gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions test/sample-test/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand Down