From ded868d49298c30f40ce52859e8ec3c708578d7c Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Thu, 8 Nov 2018 18:18:51 -0800 Subject: [PATCH 1/5] Tests - Testing master+branch instead of just branch --- test/api-integration-test/run_test.sh | 5 +++-- test/backend-unit-test/run_test.sh | 5 +++-- test/imagebuilder/build.sh | 2 +- test/sample-test/run_test.sh | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/api-integration-test/run_test.sh b/test/api-integration-test/run_test.sh index e854360ee7a..7b3b1afa1d9 100644 --- a/test/api-integration-test/run_test.sh +++ b/test/api-integration-test/run_test.sh @@ -60,8 +60,9 @@ TEST_DIR=backend/test echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/${GITHUB_REPO} ${BASE_DIR} -cd ${BASE_DIR}/${TEST_DIR} -git checkout ${COMMIT_SHA} +cd ${BASE_DIR} +git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" +cd ${TEST_DIR} echo "Run integration test..." TEST_RESULT=`go test -v ./... -namespace ${NAMESPACE} 2>&1` diff --git a/test/backend-unit-test/run_test.sh b/test/backend-unit-test/run_test.sh index 988ead181c4..738aa187d74 100644 --- a/test/backend-unit-test/run_test.sh +++ b/test/backend-unit-test/run_test.sh @@ -53,8 +53,9 @@ TEST_DIR=backend/src echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/${GITHUB_REPO} ${BASE_DIR} -cd ${BASE_DIR}/${TEST_DIR} -git checkout ${COMMIT_SHA} +cd ${BASE_DIR} +git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" +cd ${TEST_DIR} # Run test and store the exit code. echo "Run unit test..." diff --git a/test/imagebuilder/build.sh b/test/imagebuilder/build.sh index 71f6f14562a..bd5654b75d8 100644 --- a/test/imagebuilder/build.sh +++ b/test/imagebuilder/build.sh @@ -60,7 +60,7 @@ BASE_DIR=/ml echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/kubeflow/pipelines ${BASE_DIR} cd ${BASE_DIR} -git checkout ${COMMIT_SHA} +git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" echo "Waiting for dind to start..." until docker ps; do sleep 3; done; diff --git a/test/sample-test/run_test.sh b/test/sample-test/run_test.sh index 0be07541bff..dfec18e4fd7 100755 --- a/test/sample-test/run_test.sh +++ b/test/sample-test/run_test.sh @@ -112,7 +112,7 @@ BASE_DIR=/python/src/github.com/${GITHUB_REPO} echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/${GITHUB_REPO} ${BASE_DIR} cd ${BASE_DIR} -git checkout ${COMMIT_SHA} +git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" # Install argo echo "install argo" From 14dd1b37555196bae193bc33d20086a4c380677c Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Thu, 8 Nov 2018 19:02:08 -0800 Subject: [PATCH 2/5] Updated the image-builder image --- test/build_image.yaml | 2 +- test/e2e_test_gke.yaml | 2 +- test/sample_test.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/build_image.yaml b/test/build_image.yaml index de2a072dfa3..c6680522af5 100644 --- a/test/build_image.yaml +++ b/test/build_image.yaml @@ -110,7 +110,7 @@ spec: value: Dockerfile - name: image-name container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-38-g93afa4d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", diff --git a/test/e2e_test_gke.yaml b/test/e2e_test_gke.yaml index 05ef376947e..dee8c0bc12e 100644 --- a/test/e2e_test_gke.yaml +++ b/test/e2e_test_gke.yaml @@ -133,7 +133,7 @@ spec: value: Dockerfile - name: image-suffix container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-38-g93afa4d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", diff --git a/test/sample_test.yaml b/test/sample_test.yaml index 8cc1b0ea26f..5c919b75dba 100644 --- a/test/sample_test.yaml +++ b/test/sample_test.yaml @@ -622,7 +622,7 @@ spec: value: Dockerfile - name: image-suffix container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-38-g93afa4d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", @@ -651,7 +651,7 @@ spec: - name: build-script - name: image-suffix container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-38-g93afa4d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", From 2274e356153394ef88f7043350aef6d30b223ee1 Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Thu, 8 Nov 2018 19:26:41 -0800 Subject: [PATCH 3/5] Fixed "fatal: unable to auto-detect email address" --- test/api-integration-test/run_test.sh | 2 ++ test/backend-unit-test/run_test.sh | 2 ++ test/imagebuilder/build.sh | 2 ++ test/sample-test/run_test.sh | 2 ++ 4 files changed, 8 insertions(+) diff --git a/test/api-integration-test/run_test.sh b/test/api-integration-test/run_test.sh index 7b3b1afa1d9..3f187f99368 100644 --- a/test/api-integration-test/run_test.sh +++ b/test/api-integration-test/run_test.sh @@ -61,6 +61,8 @@ TEST_DIR=backend/test echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/${GITHUB_REPO} ${BASE_DIR} cd ${BASE_DIR} +git config --local user.name 'K8S Bootstrap' +git config --local user.email k8s_bootstrap@localhost git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" cd ${TEST_DIR} diff --git a/test/backend-unit-test/run_test.sh b/test/backend-unit-test/run_test.sh index 738aa187d74..59503432970 100644 --- a/test/backend-unit-test/run_test.sh +++ b/test/backend-unit-test/run_test.sh @@ -54,6 +54,8 @@ TEST_DIR=backend/src echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/${GITHUB_REPO} ${BASE_DIR} cd ${BASE_DIR} +git config --local user.name 'K8S Bootstrap' +git config --local user.email k8s_bootstrap@localhost git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" cd ${TEST_DIR} diff --git a/test/imagebuilder/build.sh b/test/imagebuilder/build.sh index bd5654b75d8..e7cc410c882 100644 --- a/test/imagebuilder/build.sh +++ b/test/imagebuilder/build.sh @@ -60,6 +60,8 @@ BASE_DIR=/ml echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/kubeflow/pipelines ${BASE_DIR} cd ${BASE_DIR} +git config --local user.name 'K8S Bootstrap' +git config --local user.email k8s_bootstrap@localhost git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" echo "Waiting for dind to start..." diff --git a/test/sample-test/run_test.sh b/test/sample-test/run_test.sh index dfec18e4fd7..854c171e588 100755 --- a/test/sample-test/run_test.sh +++ b/test/sample-test/run_test.sh @@ -112,6 +112,8 @@ BASE_DIR=/python/src/github.com/${GITHUB_REPO} echo "Clone ML pipeline code in COMMIT SHA ${COMMIT_SHA}..." git clone https://github.com/${GITHUB_REPO} ${BASE_DIR} cd ${BASE_DIR} +git config --local user.name 'K8S Bootstrap' +git config --local user.email k8s_bootstrap@localhost git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}" # Install argo From 12de245985ed0aab71112cfd395125bf1c78e51c Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Thu, 8 Nov 2018 19:28:46 -0800 Subject: [PATCH 4/5] Updated the image builder images --- test/build_image.yaml | 2 +- test/e2e_test_gke.yaml | 2 +- test/sample_test.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/build_image.yaml b/test/build_image.yaml index c6680522af5..2f7b518af07 100644 --- a/test/build_image.yaml +++ b/test/build_image.yaml @@ -110,7 +110,7 @@ spec: value: Dockerfile - name: image-name container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-39-g2274e35-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", diff --git a/test/e2e_test_gke.yaml b/test/e2e_test_gke.yaml index dee8c0bc12e..c117ad33e37 100644 --- a/test/e2e_test_gke.yaml +++ b/test/e2e_test_gke.yaml @@ -133,7 +133,7 @@ spec: value: Dockerfile - name: image-suffix container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-39-g2274e35-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", diff --git a/test/sample_test.yaml b/test/sample_test.yaml index 5c919b75dba..ad12741a247 100644 --- a/test/sample_test.yaml +++ b/test/sample_test.yaml @@ -622,7 +622,7 @@ spec: value: Dockerfile - name: image-suffix container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-39-g2274e35-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", @@ -651,7 +651,7 @@ spec: - name: build-script - name: image-suffix container: - image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-37-gded868d-e3b0c4 + image: gcr.io/ml-pipeline-staging/image-builder:v20181108-0.1.1-39-g2274e35-e3b0c4 imagePullPolicy: 'Always' args: [ "--commit_sha", "{{inputs.parameters.commit-sha}}", From 82e058d2ff809d74f0052f1d6fdfe76655193a2a Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Fri, 9 Nov 2018 13:46:41 -0800 Subject: [PATCH 5/5] Updated the backend-unit-test image --- test/unit_test_gke.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit_test_gke.yaml b/test/unit_test_gke.yaml index cf0ab9d71bb..37e6ed2f8eb 100644 --- a/test/unit_test_gke.yaml +++ b/test/unit_test_gke.yaml @@ -45,7 +45,7 @@ spec: - name: commit-sha - name: test-results-gcs-dir container: - image: gcr.io/ml-pipeline-staging/backend-unit-test:v20181108-0.1.1-37-gbd71789-e3b0c4 + image: gcr.io/ml-pipeline-staging/backend-unit-test:v20181109-0.1.1-39-g2274e35-e3b0c4 imagePullPolicy: 'Always' args: [ "--results-gcs-dir", "{{inputs.parameters.test-results-gcs-dir}}",