diff --git a/components/diagnostics/diagnose_me/component.py b/components/diagnostics/diagnose_me/component.py index 79c46546e09..a8a2db99d41 100644 --- a/components/diagnostics/diagnose_me/component.py +++ b/components/diagnostics/diagnose_me/component.py @@ -36,7 +36,7 @@ def run_diagnose_me( HALT_ON_ERROR flag is set. """ - # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' + # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' # does not come with pip3 pre-installed. import subprocess subprocess.run( @@ -157,6 +157,6 @@ def run_diagnose_me( comp.func_to_container_op( run_diagnose_me, - base_image='google/cloud-sdk:276.0.0', + base_image='google/cloud-sdk:279.0.0', output_component_file='component.yaml', ) diff --git a/components/diagnostics/diagnose_me/component.yaml b/components/diagnostics/diagnose_me/component.yaml index d9892d2e4b7..a22f72c5451 100644 --- a/components/diagnostics/diagnose_me/component.yaml +++ b/components/diagnostics/diagnose_me/component.yaml @@ -32,7 +32,7 @@ implementation: HALT_ON_ERROR flag is set. """ - # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' + # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' # does not come with pip3 pre-installed. import subprocess subprocess.run( @@ -193,7 +193,7 @@ implementation: - '----output-paths' - {outputPath: bucket} - {outputPath: project_id} - image: google/cloud-sdk:276.0.0 + image: google/cloud-sdk:279.0.0 description: |- Performs environment verification specific to this pipeline. @@ -215,4 +215,4 @@ inputs: - {name: bucket, type: String} - {name: execution_mode, type: String} - {name: project_id, type: String} -- {name: target_apis, type: String} \ No newline at end of file +- {name: target_apis, type: String} diff --git a/samples/core/exit_handler/exit_handler.py b/samples/core/exit_handler/exit_handler.py index 9c2b04c84a7..20ac35fde49 100755 --- a/samples/core/exit_handler/exit_handler.py +++ b/samples/core/exit_handler/exit_handler.py @@ -21,7 +21,7 @@ def gcs_download_op(url): return dsl.ContainerOp( name='GCS - Download', - image='google/cloud-sdk:272.0.0', + image='google/cloud-sdk:279.0.0', command=['sh', '-c'], arguments=['gsutil cat $0 | tee $1', url, '/tmp/results.txt'], file_outputs={ diff --git a/samples/core/kfp_env_validation/kfp_env_validation.ipynb b/samples/core/kfp_env_validation/kfp_env_validation.ipynb index 2d082b6666c..a916bca5009 100644 --- a/samples/core/kfp_env_validation/kfp_env_validation.ipynb +++ b/samples/core/kfp_env_validation/kfp_env_validation.ipynb @@ -52,7 +52,7 @@ " RuntimeError: If gcp credentials are not configured correctly\n", " \"\"\"\n", " \n", - " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n", + " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n", " import subprocess\n", " subprocess.run(\n", " ['curl', 'https://bootstrap.pypa.io/get-pip.py', '-o', 'get-pip.py'],\n", @@ -86,7 +86,7 @@ " RuntimeError: If gcp credentials are not configured correctly\n", " \"\"\"\n", "\n", - " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n", + " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n", " import subprocess\n", " subprocess.run(\n", " ['curl', 'https://bootstrap.pypa.io/get-pip.py', '-o', 'get-pip.py'],\n", @@ -141,7 +141,7 @@ " RuntimeError: If gcp credentials are not configured correctly\n", " \"\"\"\n", "\n", - " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n", + " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n", " import subprocess\n", " subprocess.run(\n", " ['curl', 'https://bootstrap.pypa.io/get-pip.py', '-o', 'get-pip.py'],\n", @@ -214,7 +214,7 @@ " have proper privilege to access the API status. \n", " \"\"\"\n", " \n", - " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n", + " # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n", " import subprocess\n", " subprocess.run(['curl','https://bootstrap.pypa.io/get-pip.py','-o','get-pip.py'], capture_output=True)\n", " subprocess.run(['apt-get', 'install', 'python3-distutils','--yes'], capture_output=True)\n", @@ -274,17 +274,17 @@ "import kfp.components as comp\n", "\n", "run_diagnose_me_op = comp.func_to_container_op(\n", - " run_diagnose_me, base_image='google/cloud-sdk:276.0.0')\n", + " run_diagnose_me, base_image='google/cloud-sdk:279.0.0')\n", "\n", "verify_gcp_credentials_op = comp.func_to_container_op(\n", - " verify_gcp_credentials, base_image='google/cloud-sdk:276.0.0')\n", + " verify_gcp_credentials, base_image='google/cloud-sdk:279.0.0')\n", "\n", "print_scopes_op = comp.func_to_container_op(\n", - " print_scopes, base_image='google/cloud-sdk:276.0.0')\n", + " print_scopes, base_image='google/cloud-sdk:279.0.0')\n", "\n", "\n", "verify_gcp_apis_op = comp.func_to_container_op(\n", - " verfiy_gcp_apis, base_image='google/cloud-sdk:276.0.0')" + " verfiy_gcp_apis, base_image='google/cloud-sdk:279.0.0')" ] }, { diff --git a/samples/core/parallel_join/parallel_join.py b/samples/core/parallel_join/parallel_join.py index dc061e8f174..1247d6d6e34 100755 --- a/samples/core/parallel_join/parallel_join.py +++ b/samples/core/parallel_join/parallel_join.py @@ -20,7 +20,7 @@ def gcs_download_op(url): return dsl.ContainerOp( name='GCS - Download', - image='google/cloud-sdk:272.0.0', + image='google/cloud-sdk:279.0.0', command=['sh', '-c'], arguments=['gsutil cat $0 | tee $1', url, '/tmp/results.txt'], file_outputs={ diff --git a/samples/core/secret/secret.py b/samples/core/secret/secret.py index ab611f712b5..634d5c9cf79 100644 --- a/samples/core/secret/secret.py +++ b/samples/core/secret/secret.py @@ -21,7 +21,7 @@ def gcs_read_op(url): return dsl.ContainerOp( name='Access GCS using auth token', - image='google/cloud-sdk:272.0.0', + image='google/cloud-sdk:279.0.0', command=['sh', '-c'], arguments=[ 'gsutil ls "$0" && echo "$1"', @@ -34,11 +34,11 @@ def gcs_read_op(url): def use_gcp_api_op(): return dsl.ContainerOp( name='Using Google Cloud APIs with Auth', - image='google/cloud-sdk:272.0.0', + image='google/cloud-sdk:279.0.0', command=[ 'sh', '-c', - 'pip install google-cloud-storage && "$0" "$*"', - 'python', '-c', ''' + 'pip3 install google-cloud-storage && "$0" "$*"', + 'python3', '-c', ''' from google.cloud import storage storage_client = storage.Client() buckets = storage_client.list_buckets() diff --git a/samples/core/sequential/sequential.py b/samples/core/sequential/sequential.py index 36b5d3edb86..75c211de6ba 100755 --- a/samples/core/sequential/sequential.py +++ b/samples/core/sequential/sequential.py @@ -21,7 +21,7 @@ def gcs_download_op(url): return dsl.ContainerOp( name='GCS - Download', - image='google/cloud-sdk:272.0.0', + image='google/cloud-sdk:279.0.0', command=['sh', '-c'], arguments=['gsutil cat $0 | tee $1', url, '/tmp/results.txt'], file_outputs={ diff --git a/samples/core/volume_snapshot_ops/volume_snapshot_ops.py b/samples/core/volume_snapshot_ops/volume_snapshot_ops.py index 5fc2f811266..83305e26258 100644 --- a/samples/core/volume_snapshot_ops/volume_snapshot_ops.py +++ b/samples/core/volume_snapshot_ops/volume_snapshot_ops.py @@ -30,7 +30,7 @@ def volume_snapshotop_sequential(url): step1 = dsl.ContainerOp( name="step1_ingest", - image="google/cloud-sdk:272.0.0", + image="google/cloud-sdk:279.0.0", command=["sh", "-c"], arguments=["mkdir /data/step1 && " "gsutil cat %s | gzip -c >/data/step1/file1.gz" % url], diff --git a/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.py b/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.py index ca0173a06da..76eeae47ea5 100644 --- a/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.py +++ b/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.py @@ -30,7 +30,7 @@ def volume_snapshotop_sequential(url): step1 = dsl.ContainerOp( name="step1_ingest", - image="google/cloud-sdk:272.0.0", + image="google/cloud-sdk:279.0.0", command=["sh", "-c"], arguments=["mkdir /data/step1 && " "gsutil cat %s | gzip -c >/data/step1/file1.gz" % url], diff --git a/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.yaml b/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.yaml index 3ad51af4893..a0d9ac8f2ab 100644 --- a/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.yaml +++ b/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.yaml @@ -35,7 +35,7 @@ spec: command: - sh - -c - image: google/cloud-sdk:272.0.0 + image: google/cloud-sdk:279.0.0 volumeMounts: - mountPath: /data name: create-volume diff --git a/test/build_image.yaml b/test/build_image.yaml index 223f63637cc..8c8a73bebb6 100644 --- a/test/build_image.yaml +++ b/test/build_image.yaml @@ -22,7 +22,7 @@ spec: parameters: - name: image-build-context-gcs-uri - name: image-builder-image - value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c + value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961 - name: api-image - name: frontend-image - name: scheduledworkflow-image diff --git a/test/component_test.yaml b/test/component_test.yaml index a742a2df6c3..2930457f2c1 100644 --- a/test/component_test.yaml +++ b/test/component_test.yaml @@ -22,7 +22,7 @@ spec: parameters: - name: image-build-context-gcs-uri - name: image-builder-image - value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c + value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961 - name: commit-sha - name: component-image-prefix - name: target-image-prefix diff --git a/test/e2e_test_gke_v2.yaml b/test/e2e_test_gke_v2.yaml index 2a86b76e0e9..3cd328140ae 100644 --- a/test/e2e_test_gke_v2.yaml +++ b/test/e2e_test_gke_v2.yaml @@ -22,7 +22,7 @@ spec: parameters: - name: image-build-context-gcs-uri - name: image-builder-image - value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c + value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961 - name: target-image-prefix - name: test-results-gcs-dir - name: initialization-test-image-suffix diff --git a/test/frontend-integration-test/Dockerfile b/test/frontend-integration-test/Dockerfile index c416e5c1b68..81ba79f18fd 100644 --- a/test/frontend-integration-test/Dockerfile +++ b/test/frontend-integration-test/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/ml-pipeline-test/selenium-standalone-chrome-gcloud-nodejs:v20190618-0.1.21-79-g2d40ae68-dirty-9d8d84 +FROM gcr.io/ml-pipeline-test/selenium-standalone-chrome-gcloud-nodejs:v20200210-0.2.2-30-g05865480-e3b0c4 #To build this image: cd selenium-standalone-chrome-gcloud-nodejs.Docker && make push COPY --chown=seluser . /src diff --git a/test/frontend-integration-test/selenium-standalone-chrome-gcloud-nodejs.Docker/Dockerfile b/test/frontend-integration-test/selenium-standalone-chrome-gcloud-nodejs.Docker/Dockerfile index f4c9af50c43..92a2f4522d9 100644 --- a/test/frontend-integration-test/selenium-standalone-chrome-gcloud-nodejs.Docker/Dockerfile +++ b/test/frontend-integration-test/selenium-standalone-chrome-gcloud-nodejs.Docker/Dockerfile @@ -2,7 +2,7 @@ FROM selenium/standalone-chrome:3.141.59-oxygen USER root -ARG CLOUD_SDK_VERSION=244.0.0 +ARG CLOUD_SDK_VERSION=279.0.0 ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION ARG INSTALL_COMPONENTS=kubectl diff --git a/test/imagebuilder/Dockerfile b/test/imagebuilder/Dockerfile index cd9b4657ca1..2a218c4b3ef 100644 --- a/test/imagebuilder/Dockerfile +++ b/test/imagebuilder/Dockerfile @@ -1,7 +1,7 @@ # This image contains script to pull github code, build image and push to gcr # Available at gcr.io/ml-pipeline/image-builder -FROM google/cloud-sdk +FROM google/cloud-sdk:279.0.0 COPY ./build.sh /build.sh RUN chmod +x /build.sh diff --git a/test/presubmit-tests-with-pipeline-deployment.sh b/test/presubmit-tests-with-pipeline-deployment.sh index 786074c7391..df78e11b567 100755 --- a/test/presubmit-tests-with-pipeline-deployment.sh +++ b/test/presubmit-tests-with-pipeline-deployment.sh @@ -33,7 +33,7 @@ PROJECT=ml-pipeline-test TEST_RESULT_BUCKET=ml-pipeline-test TIMEOUT_SECONDS=2700 # 45 minutes NAMESPACE=kubeflow -ENABLE_WORKLOAD_IDENTITY=false +ENABLE_WORKLOAD_IDENTITY=true while [ "$1" != "" ]; do case $1 in diff --git a/test/sample-test/Dockerfile b/test/sample-test/Dockerfile index 0b85065d9dc..e6b1bd7e673 100644 --- a/test/sample-test/Dockerfile +++ b/test/sample-test/Dockerfile @@ -1,6 +1,6 @@ # This image has the script to kick off the ML pipeline sample e2e test, -FROM google/cloud-sdk:272.0.0 +FROM google/cloud-sdk:279.0.0 RUN apt-get update -y RUN apt-get install --no-install-recommends -y -q libssl-dev libffi-dev wget ssh diff --git a/test/sample-test/configs/xgboost_training_cm.config.yaml b/test/sample-test/configs/xgboost_training_cm.config.yaml index 49dac8b3600..626a7a46a50 100644 --- a/test/sample-test/configs/xgboost_training_cm.config.yaml +++ b/test/sample-test/configs/xgboost_training_cm.config.yaml @@ -21,4 +21,4 @@ arguments: schema: gs://ml-pipeline-dataset/sample-test/sfpd/schema.json rounds: 5 workers: 2 -test_timeout: 1800 # xgboost needs extra time. +test_timeout: 3600 # xgboost needs extra time, 60 * 60 secs diff --git a/test/sample_test.yaml b/test/sample_test.yaml index c39c3e72af2..2a198b23207 100644 --- a/test/sample_test.yaml +++ b/test/sample_test.yaml @@ -22,7 +22,7 @@ spec: parameters: - name: image-build-context-gcs-uri - name: image-builder-image - value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c + value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961 - name: target-image-prefix - name: test-results-gcs-dir - name: sample-tests-image-suffix