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

Simplify sample_test.yaml #1709

Merged
merged 7 commits into from
Jul 31, 2019
Merged

Simplify sample_test.yaml #1709

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0c7132
Remove redundant import.
numerology Jul 23, 2019
70972db
Simplify sample_test.yaml by using withItem syntax.
Jul 31, 2019
deb6cc0
Merge branch 'master' of https://github.com/kubeflow/pipelines
Jul 31, 2019
da9a42a
Simplify sample_test.yaml by using withItem syntax.
Jul 31, 2019
a203039
Merge branch 'master' of https://github.com/numerology/pipelines
Jul 31, 2019
81ccbf4
Change dict to str in withItems.
Jul 31, 2019
d94a945
Merge branch 'master' of https://github.com/kubeflow/pipelines
Jul 31, 2019
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
268 changes: 102 additions & 166 deletions test/sample_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,184 +19,120 @@ metadata:
spec:
entrypoint: sample-test
volumes:
- name: gcp-credentials
secret:
secretName: user-gcp-sa
- name: gcp-credentials
secret:
secretName: user-gcp-sa
arguments:
parameters:
- name: image-build-context-gcs-uri
- name: target-image-prefix
- name: test-results-gcs-dir
- name: sample-tests-image-suffix
value: sample-tests
- name: namespace
value: kubeflow
templates:
- name: sample-test
inputs:
parameters:
- name: image-build-context-gcs-uri
- name: target-image-prefix
- name: test-results-gcs-dir
- name: sample-tests-image-suffix
value: sample-tests
- name: namespace
steps:
- - name: build-sample-tests-image
template: build-image-by-dockerfile
arguments:
parameters:
- name: docker-path
value: .
- name: docker-file
value: test/sample-test/Dockerfile
- name: image-name
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- - name: run-tf-training-tests
template: run-sample-tests
arguments:
parameters:
- name: test-results-gcs-dir
value: "{{inputs.parameters.test-results-gcs-dir}}"
- name: target-image-prefix
value: "{{inputs.parameters.target-image-prefix}}"
- name: sample-tests-image
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- name: namespace
value: "{{inputs.parameters.namespace}}"
- name: test-name
value: "tf-training"
- name: run-tfx-tests
template: run-sample-tests
arguments:
parameters:
- name: test-results-gcs-dir
value: "{{inputs.parameters.test-results-gcs-dir}}"
- name: target-image-prefix
value: "{{inputs.parameters.target-image-prefix}}"
- name: sample-tests-image
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- name: namespace
value: "{{inputs.parameters.namespace}}"
- name: test-name
value: "tfx"
- name: run-xgboost-tests
template: run-sample-tests
arguments:
parameters:
- name: test-results-gcs-dir
value: "{{inputs.parameters.test-results-gcs-dir}}"
- name: target-image-prefix
value: "{{inputs.parameters.target-image-prefix}}"
- name: sample-tests-image
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- name: namespace
value: "{{inputs.parameters.namespace}}"
- name: test-name
value: "xgboost"
- name: run-notebook-tfx-tests
template: run-sample-tests
arguments:
parameters:
- name: test-results-gcs-dir
value: "{{inputs.parameters.test-results-gcs-dir}}"
value: kubeflow
templates:
- name: sample-test
inputs:
parameters:
- name: target-image-prefix
value: "{{inputs.parameters.target-image-prefix}}"
- name: sample-tests-image
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- name: namespace
value: "{{inputs.parameters.namespace}}"
- name: test-name
value: "notebook-tfx"
- name: run-notebook-lightweight-tests
template: run-sample-tests
arguments:
parameters:
- name: test-results-gcs-dir
value: "{{inputs.parameters.test-results-gcs-dir}}"
- name: target-image-prefix
value: "{{inputs.parameters.target-image-prefix}}"
- name: sample-tests-image
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- name: sample-tests-image-suffix
- name: namespace
value: "{{inputs.parameters.namespace}}"
- name: test-name
value: "notebook-lightweight"
- name: run-notebook-typecheck-tests
template: run-sample-tests
arguments:
parameters:
steps:
- - name: build-sample-tests-image
template: build-image-by-dockerfile
arguments:
parameters:
- name: docker-path
value: .
- name: docker-file
value: test/sample-test/Dockerfile
- name: image-name
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- - name: run-sample-tests-loop
template: run-sample-tests
arguments:
parameters:
- name: namespace
value: "{{inputs.parameters.namespace}}"
- name: sample-tests-image
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- name: target-image-prefix
value: "{{inputs.parameters.target-image-prefix}}"
- name: test-results-gcs-dir
value: "{{inputs.parameters.test-results-gcs-dir}}"
- name: test-name
value: "{{item.test-name}}"
withItems:
gaoning777 marked this conversation as resolved.
Show resolved Hide resolved
- { test-name: 'tf-training' }
- { test-name: 'tfx' }
- { test-name: 'xgboost' }
- { test-name: 'notebook-tfx' }
- { test-name: 'notebook-lightweight' }
- { test-name: 'notebook-typecheck' }
# Build and push image
- name: build-image-by-dockerfile
inputs:
parameters:
# GCS URI prefix pointing to a .tar.gz archive of Docker build context
- name: image-build-context-gcs-uri
value: "{{workflow.parameters.image-build-context-gcs-uri}}"
# The relative code path to the Dockerfile
- name: docker-path
# Name of the Docker file to use. "Dockerfile" by default
- name: docker-file
value: Dockerfile
- name: image-name
outputs:
parameters:
- name: strict-image-name
valueFrom:
path: /outputs/strict-image-name/file
container:
image: gcr.io/ml-pipeline-test/image-builder:v20181128-0.1.3-rc.1-109-ga5a14dc-e3b0c4
imagePullPolicy: 'Always'
args: [
"--image-build-context-gcs-uri", "{{inputs.parameters.image-build-context-gcs-uri}}",
"--docker_path", "{{inputs.parameters.docker-path}}",
"--docker_file", "{{inputs.parameters.docker-file}}",
"--image_name", "{{inputs.parameters.image-name}}",
]
env:
- name: DOCKER_HOST
value: 127.0.0.1
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /secret/gcp-credentials/user-gcp-sa.json
volumeMounts:
- name: gcp-credentials
mountPath: /secret/gcp-credentials
sidecars:
- name: dind
image: docker:17.10-dind
securityContext:
privileged: true
mirrorVolumeMounts: true

- name: run-sample-tests
inputs:
parameters:
- name: test-results-gcs-dir
value: "{{inputs.parameters.test-results-gcs-dir}}"
- name: target-image-prefix
value: "{{inputs.parameters.target-image-prefix}}"
- name: sample-tests-image
value: "{{inputs.parameters.target-image-prefix}}{{inputs.parameters.sample-tests-image-suffix}}"
- name: namespace
value: "{{inputs.parameters.namespace}}"
- name: test-name
value: "notebook-typecheck"

# Build and push image
- name: build-image-by-dockerfile
inputs:
parameters:
# GCS URI prefix pointing to a .tar.gz archive of Docker build context
- name: image-build-context-gcs-uri
value: "{{workflow.parameters.image-build-context-gcs-uri}}"
# The relative code path to the Dockerfile
- name: docker-path
# Name of the Docker file to use. "Dockerfile" by default
- name: docker-file
value: Dockerfile
- name: image-name
outputs:
parameters:
- name: strict-image-name
valueFrom:
path: /outputs/strict-image-name/file
container:
image: gcr.io/ml-pipeline-test/image-builder:v20181128-0.1.3-rc.1-109-ga5a14dc-e3b0c4
imagePullPolicy: 'Always'
args: [
"--image-build-context-gcs-uri", "{{inputs.parameters.image-build-context-gcs-uri}}",
"--docker_path", "{{inputs.parameters.docker-path}}",
"--docker_file", "{{inputs.parameters.docker-file}}",
"--image_name", "{{inputs.parameters.image-name}}",
]
env:
- name: DOCKER_HOST
value: 127.0.0.1
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /secret/gcp-credentials/user-gcp-sa.json
volumeMounts:
- name: gcp-credentials
mountPath: /secret/gcp-credentials
sidecars:
- name: dind
image: docker:17.10-dind
securityContext:
privileged: true
mirrorVolumeMounts: true

- name: run-sample-tests
inputs:
parameters:
- name: test-results-gcs-dir
- name: target-image-prefix
- name: sample-tests-image
- name: namespace
- name: test-name
container:
image: "{{inputs.parameters.sample-tests-image}}"
args: [
"--results-gcs-dir", "{{inputs.parameters.test-results-gcs-dir}}",
"--target-image-prefix", "{{inputs.parameters.target-image-prefix}}",
"--namespace", "{{inputs.parameters.namespace}}",
"--test-name", "{{inputs.parameters.test-name}}",
]
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /secret/gcp-credentials/user-gcp-sa.json
volumeMounts:
- name: gcp-credentials
mountPath: /secret/gcp-credentials
container:
image: "{{inputs.parameters.sample-tests-image}}"
args: [
"--namespace", "{{inputs.parameters.namespace}}",
"--results-gcs-dir", "{{inputs.parameters.test-results-gcs-dir}}",
"--target-image-prefix", "{{inputs.parameters.target-image-prefix}}",
"--test-name", "{{inputs.parameters.test-name}}",
]
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /secret/gcp-credentials/user-gcp-sa.json
volumeMounts:
- name: gcp-credentials
mountPath: /secret/gcp-credentials