From e5606ee528aa40c94c8ce2d883366e45142623ba Mon Sep 17 00:00:00 2001 From: dylrich Date: Thu, 15 Jun 2023 19:58:11 +0000 Subject: [PATCH] SERVER-77608: fix upload-lock command invocation --- evergreen/packages_publish.sh | 5 +++-- evergreen/run_upload_lock_push.sh | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evergreen/packages_publish.sh b/evergreen/packages_publish.sh index 61804b300c7..7bcfd494e40 100644 --- a/evergreen/packages_publish.sh +++ b/evergreen/packages_publish.sh @@ -1,6 +1,8 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" +set -o verbose + packagesfile=${project}-${build_variant}-${revision}-${build_id}-packages.tgz curl https://s3.amazonaws.com/mciuploads/${project}/${build_variant}/${revision}/artifacts/${build_id}-packages.tgz >> $packagesfile @@ -10,14 +12,13 @@ podman run \ -w $(pwd) \ --env-host \ ${UPLOAD_LOCK_IMAGE} \ - upload-lock -key=${packagesfile} -tag=task-id=${EVERGREEN_TASK_ID} ${packagesfile} + -key=${packagesfile} -tag=task-id=${EVERGREEN_TASK_ID} ${packagesfile} cd src . ./notary_env.sh set -o errexit -set -o verbose CURATOR_RELEASE=${curator_release} curl -L -O http://boxes.10gen.com/build/curator/curator-dist-rhel70-$CURATOR_RELEASE.tar.gz diff --git a/evergreen/run_upload_lock_push.sh b/evergreen/run_upload_lock_push.sh index ed6f62b45ef..7b69d921e09 100755 --- a/evergreen/run_upload_lock_push.sh +++ b/evergreen/run_upload_lock_push.sh @@ -53,6 +53,8 @@ if [ -f "${MSI_PATH}" ]; then ARTIFACTS[${MSI_MD5_PATH}]=${MSI_MD5_KEY} fi +set -o verbose + for path in "${!ARTIFACTS[@]}"; do key=${ARTIFACTS[${path}]} @@ -61,6 +63,6 @@ for path in "${!ARTIFACTS[@]}"; do -w $(pwd) \ --env-host \ ${UPLOAD_LOCK_IMAGE} \ - upload-lock -key=${key} -tag=task-id=${EVERGREEN_TASK_ID} ${path} + -key=${key} -tag=task-id=${EVERGREEN_TASK_ID} ${path} done