Skip to content

Commit

Permalink
Fix bugs in GCP blueprint tests (kubeflow#712)
Browse files Browse the repository at this point in the history
* Related GoogleCloudPlatform/kubeflow-distribution#51 get-credentials isn't finding any clusters
  because when using Fire the parameter should be --pattern not --location

* Related GoogleCloudPlatform/kubeflow-distribution#65 When copying the bucket output
  in the notebook tests the parameter should be params.notebook-output
  not params.output
  • Loading branch information
jlewi authored Jul 1, 2020
1 parent 3fbde6d commit 43d2dbb
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- -m
- kubeflow.testing.get_kf_testing_cluster
- get-credentials
- --base=$(inputs.params.testing-cluster-pattern)
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- --output=/workspace/cluster.info.yaml
command:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ spec:
- args:
- -m
- kubeflow.testing.get_kf_testing_cluster
- --base=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- get-credentials
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
command:
- python
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ spec:
- args:
- -m
- kubeflow.testing.get_kf_testing_cluster
- --base=$(inputs.params.testing-cluster-pattern)
- get-credentials
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- get-credentials
command:
Expand Down Expand Up @@ -80,7 +81,7 @@ spec:
script: |
#!/usr/bin/env bash
set -x
gsutil cp -r $(inputs.params.output)/ $(inputs.params.artifacts-gcs)
gsutil cp -r $(inputs.params.notebook-output)/ $(inputs.params.artifacts-gcs)
# Need the echo command to prevent a gsutil error from causing the task to fail
# which would prevent the copy-artifacts step from running
echo copy-buckets finished
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- -m
- kubeflow.testing.get_kf_testing_cluster
- get-credentials
- --base=$(inputs.params.testing-cluster-pattern)
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- --output=/workspace/cluster.info.yaml
command:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ spec:
- args:
- -m
- kubeflow.testing.get_kf_testing_cluster
- --base=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- get-credentials
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
command:
- python
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ spec:
- args:
- -m
- kubeflow.testing.get_kf_testing_cluster
- --base=$(inputs.params.testing-cluster-pattern)
- get-credentials
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- get-credentials
command:
Expand Down Expand Up @@ -80,7 +81,7 @@ spec:
script: |
#!/usr/bin/env bash
set -x
gsutil cp -r $(inputs.params.output)/ $(inputs.params.artifacts-gcs)
gsutil cp -r $(inputs.params.notebook-output)/ $(inputs.params.artifacts-gcs)
# Need the echo command to prevent a gsutil error from causing the task to fail
# which would prevent the copy-artifacts step from running
echo copy-buckets finished
Expand Down
2 changes: 1 addition & 1 deletion tekton/templates/tasks/gcp-iap-endpoint-ready-task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
- -m
- kubeflow.testing.get_kf_testing_cluster
- get-credentials
- --base=$(inputs.params.testing-cluster-pattern)
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- --output=/workspace/cluster.info.yaml
env:
Expand Down
4 changes: 2 additions & 2 deletions tekton/templates/tasks/kf-ready-task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ spec:
args:
- -m
- kubeflow.testing.get_kf_testing_cluster
- --base=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- get-credentials
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
env:
- name: PYTHONPATH
value: /workspace/$(inputs.resources.kfctl-repo.name)/py:/srcCache/kubeflow/testing/py
Expand Down
5 changes: 3 additions & 2 deletions tekton/templates/tasks/notebook-test-task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ spec:
args:
- -m
- kubeflow.testing.get_kf_testing_cluster
- --base=$(inputs.params.testing-cluster-pattern)
- get-credentials
- --pattern=$(inputs.params.testing-cluster-pattern)
- --location=$(inputs.params.testing-cluster-location)
- get-credentials
env:
Expand Down Expand Up @@ -89,7 +90,7 @@ spec:
script: |
#!/usr/bin/env bash
set -x
gsutil cp -r $(inputs.params.output)/ $(inputs.params.artifacts-gcs)
gsutil cp -r $(inputs.params.notebook-output)/ $(inputs.params.artifacts-gcs)
# Need the echo command to prevent a gsutil error from causing the task to fail
# which would prevent the copy-artifacts step from running
echo copy-buckets finished
Expand Down

0 comments on commit 43d2dbb

Please sign in to comment.