From 027de62cf8e37f62330d76dba67ed07cce81a1ba Mon Sep 17 00:00:00 2001
From: Adam Nichols <anichols@broadinstitute.org>
Date: Tue, 19 Mar 2024 13:25:14 -0400
Subject: [PATCH] WX-1519 Stop leaking DRS Localizer images on every CI run
 (#7390)

---
 src/ci/bin/test.inc.sh                                | 2 +-
 src/ci/bin/test_gcpbatch.inc.sh                       | 6 +++---
 src/ci/bin/test_papi.inc.sh                           | 5 ++---
 src/ci/resources/gcp_batch_application.inc.conf.ctmpl | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/ci/bin/test.inc.sh b/src/ci/bin/test.inc.sh
index 7aebd3698fb..108a3d09843 100755
--- a/src/ci/bin/test.inc.sh
+++ b/src/ci/bin/test.inc.sh
@@ -199,7 +199,7 @@ cromwell::private::create_build_variables() {
     esac
 
     if [[ "${CROMWELL_BUILD_IS_CI}" == "true" ]]; then
-        CROMWELL_BUILD_DOCKER_TAG="${CROMWELL_BUILD_PROVIDER}-${CROMWELL_BUILD_NUMBER}"
+        CROMWELL_BUILD_DOCKER_TAG="${CROMWELL_BUILD_PROVIDER}-${CROMWELL_BUILD_TYPE}-${CROMWELL_BUILD_NUMBER}"
     else
         CROMWELL_BUILD_DOCKER_TAG="${CROMWELL_BUILD_PROVIDER}-${CROMWELL_BUILD_TYPE}-${CROMWELL_BUILD_GIT_HASH_SUFFIX}"
     fi
diff --git a/src/ci/bin/test_gcpbatch.inc.sh b/src/ci/bin/test_gcpbatch.inc.sh
index 641cd86d612..0a7c051ccf7 100644
--- a/src/ci/bin/test_gcpbatch.inc.sh
+++ b/src/ci/bin/test_gcpbatch.inc.sh
@@ -67,8 +67,7 @@ cromwell::private::batch::gcr_image_push() {
 
     cromwell::build::build_docker_image "${executable_name}" "${docker_image}"
     echo "${docker_image}" >> "${CROMWELL_BUILD_BATCH_GCR_IMAGES}"
-    # Use cat to quiet docker: https://github.com/moby/moby/issues/36655#issuecomment-375136087
-    docker push "${docker_image}" | cat
+    docker push --quiet "${docker_image}"
 }
 
 cromwell::private::batch::gcr_image_delete() {
@@ -86,7 +85,7 @@ cromwell::private::batch::setup_batch_gcr() {
     elif command -v docker; then
         # Upload images built from this commit
         gcloud auth configure-docker --quiet
-        CROMWELL_BUILD_BATCH_DOCKER_IMAGE_DRS="gcr.io/${CROMWELL_BUILD_BATCH_PROJECT_ID}/cromwell-drs-localizer:${CROMWELL_BUILD_DOCKER_TAG}-batch"
+        CROMWELL_BUILD_BATCH_DOCKER_IMAGE_DRS="gcr.io/${CROMWELL_BUILD_BATCH_PROJECT_ID}/cromwell-drs-localizer:${CROMWELL_BUILD_DOCKER_TAG}"
         cromwell::private::batch::gcr_image_push cromwell-drs-localizer "${CROMWELL_BUILD_BATCH_DOCKER_IMAGE_DRS}"
         export CROMWELL_BUILD_BATCH_DOCKER_IMAGE_DRS
     else
@@ -102,5 +101,6 @@ cromwell::private::batch::setup_batch_service_account() {
 
 cromwell::build::batch::setup_batch_centaur_environment() {
     cromwell::private::batch::setup_batch_gcloud
+    cromwell::private::batch::setup_batch_gcr
     cromwell::private::batch::setup_batch_service_account
 }
diff --git a/src/ci/bin/test_papi.inc.sh b/src/ci/bin/test_papi.inc.sh
index 0b4ed151664..5c59ee1b38f 100644
--- a/src/ci/bin/test_papi.inc.sh
+++ b/src/ci/bin/test_papi.inc.sh
@@ -66,8 +66,7 @@ cromwell::private::papi::gcr_image_push() {
 
     cromwell::build::build_docker_image "${executable_name}" "${docker_image}"
     echo "${docker_image}" >> "${CROMWELL_BUILD_PAPI_GCR_IMAGES}"
-    # Use cat to quiet docker: https://github.com/moby/moby/issues/36655#issuecomment-375136087
-    docker push "${docker_image}" | cat
+    docker push --quiet "${docker_image}"
 }
 
 cromwell::private::papi::gcr_image_delete() {
@@ -85,7 +84,7 @@ cromwell::private::papi::setup_papi_gcr() {
     elif command -v docker; then
         # Upload images built from this commit
         gcloud auth configure-docker --quiet
-        CROMWELL_BUILD_PAPI_DOCKER_IMAGE_DRS="gcr.io/${CROMWELL_BUILD_PAPI_PROJECT_ID}/cromwell-drs-localizer:${CROMWELL_BUILD_DOCKER_TAG}-papi"
+        CROMWELL_BUILD_PAPI_DOCKER_IMAGE_DRS="gcr.io/${CROMWELL_BUILD_PAPI_PROJECT_ID}/cromwell-drs-localizer:${CROMWELL_BUILD_DOCKER_TAG}"
         cromwell::private::papi::gcr_image_push cromwell-drs-localizer "${CROMWELL_BUILD_PAPI_DOCKER_IMAGE_DRS}"
         export CROMWELL_BUILD_PAPI_DOCKER_IMAGE_DRS
     else
diff --git a/src/ci/resources/gcp_batch_application.inc.conf.ctmpl b/src/ci/resources/gcp_batch_application.inc.conf.ctmpl
index aebdd7ea377..bedffda63df 100644
--- a/src/ci/resources/gcp_batch_application.inc.conf.ctmpl
+++ b/src/ci/resources/gcp_batch_application.inc.conf.ctmpl
@@ -67,7 +67,7 @@ filesystems.drs.global.config.resolver.url = "https://drshub.dsde-dev.broadinsti
 
 drs {
   localization {
-    docker-image = "Error: BA-6546 The environment variable CROMWELL_BUILD_PAPI_DOCKER_IMAGE_DRS must be set/export pointing to a valid docker image"
-    docker-image = ${?CROMWELL_BUILD_PAPI_DOCKER_IMAGE_DRS}
+    docker-image = "Error: BA-6546 The environment variable CROMWELL_BUILD_BATCH_DOCKER_IMAGE_DRS must be set/export pointing to a valid docker image"
+    docker-image = ${?CROMWELL_BUILD_BATCH_DOCKER_IMAGE_DRS}
   }
 }