From 0711566754c0d343eaf90afb14101747bcf521ba Mon Sep 17 00:00:00 2001 From: IronPan Date: Sun, 22 Sep 2019 07:53:23 +0800 Subject: [PATCH] Build inverse proxy image as part of the presubmit test (#2187) * small fixes * add * Delete Makefile --- test/build-images.sh | 3 ++- test/cloudbuild/batch_build.yaml | 4 ++++ test/deploy-pipeline-lite.sh | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/build-images.sh b/test/build-images.sh index d1cf94c49c4..56c27868734 100755 --- a/test/build-images.sh +++ b/test/build-images.sh @@ -29,10 +29,11 @@ if echo "$BUILT_IMAGES" | grep scheduledworkflow && \ echo "$BUILT_IMAGES" | grep persistenceagent && \ echo "$BUILT_IMAGES" | grep viewer-crd-controller && \ + echo "$BUILT_IMAGES" | grep inverse-proxy-agent && \ echo "$BUILT_IMAGES" | grep visualization-server; then echo "docker images for api-server, frontend, scheduledworkflow, \ - persistenceagent, viewer-crd-controller, and visualization-server \ + persistenceagent, viewer-crd-controller, inverse-proxy-agent, and visualization-server \ are already built in ${GCR_IMAGE_BASE_DIR}." else echo "submitting cloud build to build docker images for commit ${PULL_PULL_SHA}..." diff --git a/test/cloudbuild/batch_build.yaml b/test/cloudbuild/batch_build.yaml index 6b6e70d2fdd..78ada4534b3 100644 --- a/test/cloudbuild/batch_build.yaml +++ b/test/cloudbuild/batch_build.yaml @@ -19,6 +19,10 @@ steps: args: ["build", "-t", "$_GCR_BASE/visualization-server", "-f", "backend/Dockerfile.visualization", "."] waitFor: ["-"] + - name: "gcr.io/cloud-builders/docker" + args: + ["build", "-t", "$_GCR_BASE/inverse-proxy-agent", "-f", "proxy/Dockerfile", "."] + waitFor: ["-"] options: machineType: N1_HIGHCPU_8 # use a fast machine to build because there a lot of work images: diff --git a/test/deploy-pipeline-lite.sh b/test/deploy-pipeline-lite.sh index dd03895dd4c..1c73341423e 100755 --- a/test/deploy-pipeline-lite.sh +++ b/test/deploy-pipeline-lite.sh @@ -45,6 +45,7 @@ kustomize edit set image gcr.io/ml-pipeline/scheduledworkflow=${GCR_IMAGE_BASE_D kustomize edit set image gcr.io/ml-pipeline/frontend=${GCR_IMAGE_BASE_DIR}/frontend:${GCR_IMAGE_TAG} kustomize edit set image gcr.io/ml-pipeline/viewer-crd-controller=${GCR_IMAGE_BASE_DIR}/viewer-crd-controller:${GCR_IMAGE_TAG} kustomize edit set image gcr.io/ml-pipeline/visualization-server=${GCR_IMAGE_BASE_DIR}/visualization-server:${GCR_IMAGE_TAG} +kustomize edit set image gcr.io/ml-pipeline/inverse-proxy-agent=${GCR_IMAGE_BASE_DIR}/inverse-proxy-agent:${GCR_IMAGE_TAG} cat kustomization.yaml kustomize build . | kubectl apply -f -