jenkins: remove the logic to upload to private bucket for Pro and LTS

The LTS and Pro feature no longer requires the private bucket
hence we can remove the --private argument to upload

Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
This commit is contained in:
Sayan Chowdhury 2022-05-24 15:53:29 +05:30
parent e3bb9751fd
commit 83eb45b810
No known key found for this signature in database
GPG Key ID: B02399319CD05C8B
2 changed files with 2 additions and 12 deletions

View File

@ -4,7 +4,7 @@ set -ex
AZURE_CATEGORY_OPT=""
if [[ "${IS_NON_SPONSORED}" == true ]]
then
AZURE_CATEGORY_OPT="--azure-category=pro --private"
AZURE_CATEGORY_OPT="--azure-category=pro"
fi
rm -f images.json

View File

@ -91,15 +91,6 @@ then
FORMATS="${FORMAT}"
fi
for FORMAT in ${FORMATS}; do
# If the format variable ends with _pro it's a Flatcar Pro image and it should
# be uploaded to the private bucket.
PRIVATE_UPLOAD_OPT=""
if [[ -z "${FORMAT##*_pro}" ]]
then
PRIVATE_UPLOAD_OPT="--private"
UPLOAD_ROOT=${UPLOAD_PRIVATE_ROOT}
fi
script image_to_vm.sh \
--board="${BOARD}" \
--format="${FORMAT}" \
@ -111,6 +102,5 @@ for FORMAT in ${FORMATS}; do
--sign_digests="${SIGNING_USER}" \
--download_root="${DOWNLOAD_ROOT}" \
--upload_root="${UPLOAD_ROOT}" \
--upload \
${PRIVATE_UPLOAD_OPT}
--upload
done