From 0a35e9d36b830846221f3b3f5ff723e1abe3b6e5 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Mon, 18 Mar 2024 17:25:35 -0400 Subject: [PATCH 1/5] Test --- src/ci/bin/test_papi.inc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/bin/test_papi.inc.sh b/src/ci/bin/test_papi.inc.sh index 0b4ed151664..71f170038e4 100644 --- a/src/ci/bin/test_papi.inc.sh +++ b/src/ci/bin/test_papi.inc.sh @@ -67,7 +67,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 "${docker_image}" } cromwell::private::papi::gcr_image_delete() { From f1d112c49e334821bca40317df4c63daf62b81d3 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Mon, 18 Mar 2024 17:57:27 -0400 Subject: [PATCH 2/5] Test 2 --- src/ci/bin/test_papi.inc.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ci/bin/test_papi.inc.sh b/src/ci/bin/test_papi.inc.sh index 71f170038e4..898bdcb02f2 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}" + docker push --quiet "${docker_image}" } cromwell::private::papi::gcr_image_delete() { From ee81fcd0891f653a5814e2ff58596e690cb97df7 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Mon, 18 Mar 2024 18:44:36 -0400 Subject: [PATCH 3/5] Also for GCP Batch --- src/ci/bin/test_gcpbatch.inc.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ci/bin/test_gcpbatch.inc.sh b/src/ci/bin/test_gcpbatch.inc.sh index 641cd86d612..85cf4b6cab1 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() { From 34c3f00077cd66b3b30125daaa643a27d0fef56a Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Mon, 18 Mar 2024 19:38:46 -0400 Subject: [PATCH 4/5] Batch fix --- src/ci/bin/test_gcpbatch.inc.sh | 1 + src/ci/resources/gcp_batch_application.inc.conf.ctmpl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ci/bin/test_gcpbatch.inc.sh b/src/ci/bin/test_gcpbatch.inc.sh index 85cf4b6cab1..457180691d5 100644 --- a/src/ci/bin/test_gcpbatch.inc.sh +++ b/src/ci/bin/test_gcpbatch.inc.sh @@ -101,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/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} } } From e4e04aaedb819186d65ac4197e188efa4ef57808 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Mon, 18 Mar 2024 20:16:41 -0400 Subject: [PATCH 5/5] Fix --- src/ci/bin/test.inc.sh | 2 +- src/ci/bin/test_gcpbatch.inc.sh | 2 +- src/ci/bin/test_papi.inc.sh | 2 +- 3 files changed, 3 insertions(+), 3 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 457180691d5..0a7c051ccf7 100644 --- a/src/ci/bin/test_gcpbatch.inc.sh +++ b/src/ci/bin/test_gcpbatch.inc.sh @@ -85,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 diff --git a/src/ci/bin/test_papi.inc.sh b/src/ci/bin/test_papi.inc.sh index 898bdcb02f2..5c59ee1b38f 100644 --- a/src/ci/bin/test_papi.inc.sh +++ b/src/ci/bin/test_papi.inc.sh @@ -84,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