From ae84bfb0554e42abb724f19ebbee4895297e83ae Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 6 Mar 2023 18:11:12 +0200 Subject: [PATCH 1/2] Log source file Signed-off-by: Evan Lezar --- scripts/release-kitmaker-artifactory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release-kitmaker-artifactory.sh b/scripts/release-kitmaker-artifactory.sh index 1ad1d1e9..e6483e89 100755 --- a/scripts/release-kitmaker-artifactory.sh +++ b/scripts/release-kitmaker-artifactory.sh @@ -180,7 +180,7 @@ function upload_archive() { done local PROPS=$(join_by ";" "${props[@]}") - echo "Uploading ${upload_url} from ${file}" + echo "Uploading ${upload_url} from ${archive}" if ! ${CURL} -f \ -H "X-JFrog-Art-Api: ${ARTIFACTORY_TOKEN}" \ -H "X-Checksum-Sha1: ${sha1_checksum}" \ From 89c18c73cdd35bcea21e793c2e7c726276ed32cc Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 6 Mar 2023 18:26:05 +0200 Subject: [PATCH 2/2] Add source and log curl command Signed-off-by: Evan Lezar --- scripts/release-kitmaker-artifactory.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/release-kitmaker-artifactory.sh b/scripts/release-kitmaker-artifactory.sh index e6483e89..90698f72 100755 --- a/scripts/release-kitmaker-artifactory.sh +++ b/scripts/release-kitmaker-artifactory.sh @@ -167,6 +167,7 @@ function upload_archive() { props+=("platform=${os}-${arch}") props+=("changelist=${GIT_COMMIT_SHORT}") props+=("branch=${GIT_BRANCH}") + props+=("source=https://gitlab.com/nvidia/container-toolkit/container-toolkit") # Package properties: props+=("package.epoch=${IMAGE_EPOCH}") props+=("package.version=${VERSION}") @@ -181,6 +182,10 @@ function upload_archive() { local PROPS=$(join_by ";" "${props[@]}") echo "Uploading ${upload_url} from ${archive}" + echo -H "X-JFrog-Art-Api: REDACTED" \ + -H "X-Checksum-Sha1: ${sha1_checksum}" \ + ${archive:+-T ${archive}} -X PUT \ + "${upload_url};${PROPS}" if ! ${CURL} -f \ -H "X-JFrog-Art-Api: ${ARTIFACTORY_TOKEN}" \ -H "X-Checksum-Sha1: ${sha1_checksum}" \