Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WX-1519 Stop leaking DRS Localizer images on every CI run #7390

Merged
merged 5 commits into from
Mar 19, 2024
Merged

WX-1519 Stop leaking DRS Localizer images on every CI run #7390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a35e9d
Test
aednichols Mar 18, 2024
f1d112c
Test 2
aednichols Mar 18, 2024
ee81fcd
Also for GCP Batch
aednichols Mar 18, 2024
34c3f00
Batch fix
aednichols Mar 18, 2024
e4e04aa
Fix
aednichols Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ci/bin/test.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/ci/bin/test_gcpbatch.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
Expand All @@ -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
}
5 changes: 2 additions & 3 deletions src/ci/bin/test_papi.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/ci/resources/gcp_batch_application.inc.conf.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}
}
Loading