diff --git a/test/e2e_test_gke.yaml b/test/e2e_test_gke.yaml index c117ad33e37..22dfc9ac98a 100644 --- a/test/e2e_test_gke.yaml +++ b/test/e2e_test_gke.yaml @@ -31,6 +31,8 @@ spec: value: api_integration_test - name: frontend-integration-tests-image-suffix value: frontend-integration-tests + - name: basic-e2e-tests-image-suffix + value: basic-e2e-tests - name: cluster-type value: gke templates: @@ -46,6 +48,7 @@ spec: - name: persistenceagent-image - name: api-integration-test-image-suffix - name: frontend-integration-tests-image-suffix + - name: basic-e2e-tests-image-suffix steps: - - name: get-project template: get-project @@ -73,6 +76,18 @@ spec: value: test/frontend-integration-test - name: image-suffix value: "{{inputs.parameters.frontend-integration-tests-image-suffix}}" + - name: build-basic-e2e-tests-image + template: build-image + arguments: + parameters: + - name: project + value: "{{steps.get-project.outputs.result}}" + - name: commit-sha + value: "{{inputs.parameters.commit-sha}}" + - name: docker-path + value: test/sample-test + - name: image-suffix + value: "{{inputs.parameters.basic-e2e-tests-image-suffix}}" - - name: deploy-ml-pipeline template: deploy-ml-pipeline arguments: @@ -110,6 +125,66 @@ 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" - name: get-project script: @@ -195,4 +270,18 @@ spec: "--commit_sha", "{{inputs.parameters.commit-sha}}", "--results-gcs-dir", "{{inputs.parameters.test-results-gcs-dir}}", ] + - name: run-basic-e2e-tests + inputs: + parameters: + - name: commit-sha + - name: test-results-gcs-dir + - name: sample-tests-image + - name: test-name + container: + image: "{{inputs.parameters.sample-tests-image}}" + args: [ + "--commit_sha", "{{inputs.parameters.commit-sha}}", + "--results-gcs-dir", "{{inputs.parameters.test-results-gcs-dir}}", + "--test-name", "{{inputs.parameters.test-name}}", + ] diff --git a/test/frontend-integration-test/helloworld.spec.js b/test/frontend-integration-test/helloworld.spec.js index 2b7fc077ff1..e0a831e6d02 100644 --- a/test/frontend-integration-test/helloworld.spec.js +++ b/test/frontend-integration-test/helloworld.spec.js @@ -169,14 +169,15 @@ describe('deploy helloworld sample run', () => { assert(logs.indexOf(outputParameterValue + ' from node: ') > -1, 'logs do not look right: ' + logs); }); - - it('deletes the uploaded pipeline', () => { - $('#pipelinesBtn').click(); - - browser.waitForVisible('.tableRow', waitTimeout); - $('.tableRow').click(); - $('#deleteBtn').click(); - $('.dialogButton').click(); - $('.dialog').waitForVisible(waitTimeout, true); - }); + //TODO: enable this after we change the pipeline to a unique name such that deleting this + // pipeline will not jeopardize the concurrent basic e2e tests. + // it('deletes the uploaded pipeline', () => { + // $('#pipelinesBtn').click(); + // + // browser.waitForVisible('.tableRow', waitTimeout); + // $('.tableRow').click(); + // $('#deleteBtn').click(); + // $('.dialogButton').click(); + // $('.dialog').waitForVisible(waitTimeout, true); + // }); }); diff --git a/test/sample_test.yaml b/test/sample_test.yaml index ad12741a247..1082f00d588 100644 --- a/test/sample_test.yaml +++ b/test/sample_test.yaml @@ -400,206 +400,6 @@ spec: value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.sample-tests-image-suffix}}" - name: test-name value: "xgboost" - - name: run-condition-tests - template: run-sample-tests - arguments: - parameters: - - name: commit-sha - value: "{{inputs.parameters.commit-sha}}" - - name: test-results-gcs-dir - value: "{{inputs.parameters.test-results-gcs-dir}}" - - name: dataflow-tft-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tft-image-suffix}}" - - name: dataflow-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-predict-image-suffix}}" - - name: dataflow-tfma-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfma-image-suffix}}" - - name: dataflow-tfdv-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfdv-image-suffix}}" - - name: dataproc-create-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-create-cluster-image-suffix}}" - - name: dataproc-delete-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-delete-cluster-image-suffix}}" - - name: dataproc-analyze-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-analyze-image-suffix}}" - - name: dataproc-transform-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-transform-image-suffix}}" - - name: dataproc-train-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-train-image-suffix}}" - - name: dataproc-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-predict-image-suffix}}" - - name: kubeflow-dnntrainer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}" - - name: kubeflow-deployer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-deployer-image-suffix}}" - - name: local-confusionmatrix-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-confusionmatrix-image-suffix}}" - - name: local-roc-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-roc-image-suffix}}" - - name: sample-tests-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.sample-tests-image-suffix}}" - - name: test-name - value: "condition" - - name: run-exit-handler-tests - template: run-sample-tests - arguments: - parameters: - - name: commit-sha - value: "{{inputs.parameters.commit-sha}}" - - name: test-results-gcs-dir - value: "{{inputs.parameters.test-results-gcs-dir}}" - - name: dataflow-tft-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tft-image-suffix}}" - - name: dataflow-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-predict-image-suffix}}" - - name: dataflow-tfma-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfma-image-suffix}}" - - name: dataflow-tfdv-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfdv-image-suffix}}" - - name: dataproc-create-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-create-cluster-image-suffix}}" - - name: dataproc-delete-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-delete-cluster-image-suffix}}" - - name: dataproc-analyze-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-analyze-image-suffix}}" - - name: dataproc-transform-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-transform-image-suffix}}" - - name: dataproc-train-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-train-image-suffix}}" - - name: dataproc-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-predict-image-suffix}}" - - name: kubeflow-dnntrainer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}" - - name: kubeflow-deployer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-deployer-image-suffix}}" - - name: local-confusionmatrix-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-confusionmatrix-image-suffix}}" - - name: local-roc-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-roc-image-suffix}}" - - name: sample-tests-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.sample-tests-image-suffix}}" - - name: test-name - value: "exithandler" - - name: run-sequential-tests - template: run-sample-tests - arguments: - parameters: - - name: commit-sha - value: "{{inputs.parameters.commit-sha}}" - - name: test-results-gcs-dir - value: "{{inputs.parameters.test-results-gcs-dir}}" - - name: dataflow-tft-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tft-image-suffix}}" - - name: dataflow-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-predict-image-suffix}}" - - name: dataflow-tfma-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfma-image-suffix}}" - - name: dataflow-tfdv-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfdv-image-suffix}}" - - name: dataproc-create-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-create-cluster-image-suffix}}" - - name: dataproc-delete-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-delete-cluster-image-suffix}}" - - name: dataproc-analyze-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-analyze-image-suffix}}" - - name: dataproc-transform-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-transform-image-suffix}}" - - name: dataproc-train-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-train-image-suffix}}" - - name: dataproc-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-predict-image-suffix}}" - - name: kubeflow-dnntrainer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}" - - name: kubeflow-deployer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-deployer-image-suffix}}" - - name: local-confusionmatrix-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-confusionmatrix-image-suffix}}" - - name: local-roc-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-roc-image-suffix}}" - - name: sample-tests-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.sample-tests-image-suffix}}" - - name: test-name - value: "sequential" - - name: run-immediate-value-tests - template: run-sample-tests - arguments: - parameters: - - name: commit-sha - value: "{{inputs.parameters.commit-sha}}" - - name: test-results-gcs-dir - value: "{{inputs.parameters.test-results-gcs-dir}}" - - name: dataflow-tft-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tft-image-suffix}}" - - name: dataflow-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-predict-image-suffix}}" - - name: dataflow-tfma-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfma-image-suffix}}" - - name: dataflow-tfdv-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfdv-image-suffix}}" - - name: dataproc-create-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-create-cluster-image-suffix}}" - - name: dataproc-delete-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-delete-cluster-image-suffix}}" - - name: dataproc-analyze-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-analyze-image-suffix}}" - - name: dataproc-transform-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-transform-image-suffix}}" - - name: dataproc-train-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-train-image-suffix}}" - - name: dataproc-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-predict-image-suffix}}" - - name: kubeflow-dnntrainer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}" - - name: kubeflow-deployer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-deployer-image-suffix}}" - - name: local-confusionmatrix-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-confusionmatrix-image-suffix}}" - - name: local-roc-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-roc-image-suffix}}" - - name: sample-tests-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.sample-tests-image-suffix}}" - - name: test-name - value: "immediatevalue" - - name: run-parallel-join-tests - template: run-sample-tests - arguments: - parameters: - - name: commit-sha - value: "{{inputs.parameters.commit-sha}}" - - name: test-results-gcs-dir - value: "{{inputs.parameters.test-results-gcs-dir}}" - - name: dataflow-tft-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tft-image-suffix}}" - - name: dataflow-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-predict-image-suffix}}" - - name: dataflow-tfma-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfma-image-suffix}}" - - name: dataflow-tfdv-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataflow-tfdv-image-suffix}}" - - name: dataproc-create-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-create-cluster-image-suffix}}" - - name: dataproc-delete-cluster-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-delete-cluster-image-suffix}}" - - name: dataproc-analyze-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-analyze-image-suffix}}" - - name: dataproc-transform-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-transform-image-suffix}}" - - name: dataproc-train-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-train-image-suffix}}" - - name: dataproc-predict-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.dataproc-predict-image-suffix}}" - - name: kubeflow-dnntrainer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-dnntrainer-image-suffix}}" - - name: kubeflow-deployer-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.kubeflow-deployer-image-suffix}}" - - name: local-confusionmatrix-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-confusionmatrix-image-suffix}}" - - name: local-roc-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.local-roc-image-suffix}}" - - name: sample-tests-image - value: "gcr.io/{{steps.get-project.outputs.result}}/{{inputs.parameters.commit-sha}}/{{inputs.parameters.sample-tests-image-suffix}}" - - name: test-name - value: "paralleljoin" - name: get-project script: image: google/cloud-sdk