Merge branch 'master' into release

kubeflow · Feb 12, 2019 · 0bfb8c2 · 0bfb8c2
2 parents 5380182 + 198945d
commit 0bfb8c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml
@@ -50,6 +50,18 @@ steps:
   id:   'tagScheduledworkflowCommitSHA'
   waitFor: ['pullScheduledworkflow']
 
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['pull', 'gcr.io/$PROJECT_ID/viewer-crd-controller:$COMMIT_SHA']
+  id:   'pullViewerCrdController'
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['tag', 'gcr.io/$PROJECT_ID/viewer-crd-controller:$COMMIT_SHA', 'gcr.io/ml-pipeline/viewer-crd-controller:$TAG_NAME']
+  id:   'tagViewerCrdControllerVersionNumber'
+  waitFor: ['pullViewerCrdController']
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['tag', 'gcr.io/$PROJECT_ID/viewer-crd-controller:$COMMIT_SHA', 'gcr.io/ml-pipeline/viewer-crd-controller:$COMMIT_SHA']
+  id:   'tagViewerCrdControllerCommitSHA'
+  waitFor: ['pullViewerCrdController']
+
 - name: 'gcr.io/cloud-builders/docker'
   args: ['pull', 'gcr.io/$PROJECT_ID/persistenceagent:$COMMIT_SHA']
   id:   'pullPersistenceagent'
@@ -99,5 +111,7 @@ images:
 - 'gcr.io/ml-pipeline/scheduledworkflow:$COMMIT_SHA'
 - 'gcr.io/ml-pipeline/persistenceagent:$TAG_NAME'
 - 'gcr.io/ml-pipeline/persistenceagent:$COMMIT_SHA'
+- 'gcr.io/ml-pipeline/viewer-crd-controller:$TAG_NAME'
+- 'gcr.io/ml-pipeline/viewer-crd-controller:$COMMIT_SHA'
 
 timeout: '1200s'
diff --git a/test/presubmit-tests-with-pipeline-deployment.sh b/test/presubmit-tests-with-pipeline-deployment.sh
@@ -71,7 +71,7 @@ echo "presubmit test starts"
 
 # activating the service account
 gcloud auth activate-service-account --key-file="${GOOGLE_APPLICATION_CREDENTIALS}"
-gcloud config set compute/zone us-central1-a
+gcloud config set compute/zone us-west1-a
 gcloud config set core/project ${PROJECT}
 
 #Uploading the source code to GCS: