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

Tests - Testing master+branch instead of just branch #165

Merged
merged 5 commits into from
Nov 9, 2018
Merged

Tests - Testing master+branch instead of just branch #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ded868d
Tests - Testing master+branch instead of just branch
Ark-kun Nov 9, 2018
14dd1b3
Updated the image-builder image
Ark-kun Nov 9, 2018
2274e35
Fixed "fatal: unable to auto-detect email address"
Ark-kun Nov 9, 2018
12de245
Updated the image builder images
Ark-kun Nov 9, 2018
82e058d
Updated the backend-unit-test image
Ark-kun Nov 9, 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
7 changes: 5 additions & 2 deletions test/api-integration-test/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@ 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 config --local user.name 'K8S Bootstrap'
Ark-kun marked this conversation as resolved.
Show resolved Hide resolved
git config --local user.email k8s_bootstrap@localhost
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`
Expand Down
7 changes: 5 additions & 2 deletions test/backend-unit-test/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ 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}
Ark-kun marked this conversation as resolved.
Show resolved Hide resolved
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}

# Run test and store the exit code.
echo "Run unit test..."
Expand Down
2 changes: 1 addition & 1 deletion test/build_image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-39-g2274e35-e3b0c4
imagePullPolicy: 'Always'
args: [
"--commit_sha", "{{inputs.parameters.commit-sha}}",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_test_gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-39-g2274e35-e3b0c4
imagePullPolicy: 'Always'
args: [
"--commit_sha", "{{inputs.parameters.commit-sha}}",
Expand Down
4 changes: 3 additions & 1 deletion test/imagebuilder/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ 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 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..."
until docker ps; do sleep 3; done;
Expand Down
4 changes: 3 additions & 1 deletion test/sample-test/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ 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 config --local user.name 'K8S Bootstrap'
Ark-kun marked this conversation as resolved.
Show resolved Hide resolved
git config --local user.email k8s_bootstrap@localhost
git merge --no-ff ${COMMIT_SHA} -m "Merged PR ${COMMIT_SHA}"

# Install argo
echo "install argo"
Expand Down
4 changes: 2 additions & 2 deletions test/sample_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-39-g2274e35-e3b0c4
imagePullPolicy: 'Always'
args: [
"--commit_sha", "{{inputs.parameters.commit-sha}}",
Expand Down Expand Up @@ -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-39-g2274e35-e3b0c4
imagePullPolicy: 'Always'
args: [
"--commit_sha", "{{inputs.parameters.commit-sha}}",
Expand Down
2 changes: 1 addition & 1 deletion test/unit_test_gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}",
Expand Down