From 8492dc9329de8b62ac9f6fa06799ac9847b28644 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 24 May 2022 13:14:34 +0530 Subject: [PATCH] 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 --- jenkins/prerelease/azure.sh | 2 +- jenkins/vms.sh | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/jenkins/prerelease/azure.sh b/jenkins/prerelease/azure.sh index 891d7c5b6f..5788acd560 100755 --- a/jenkins/prerelease/azure.sh +++ b/jenkins/prerelease/azure.sh @@ -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 diff --git a/jenkins/vms.sh b/jenkins/vms.sh index 132f9a08f1..68012b97e3 100755 --- a/jenkins/vms.sh +++ b/jenkins/vms.sh @@ -104,15 +104,6 @@ if [[ "${FORMATS}" == *"azure_gen2"* ]] ; then 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 - COMPRESSION_FORMAT="bz2" if [[ "${FORMAT}" =~ ^(openstack|openstack_mini|digitalocean)$ ]];then @@ -131,6 +122,5 @@ for FORMAT in ${FORMATS}; do --download_root="${DOWNLOAD_ROOT}" \ --upload_root="${UPLOAD_ROOT}" \ --image_compression_formats="${COMPRESSION_FORMAT}" \ - --upload \ - ${PRIVATE_UPLOAD_OPT} + --upload done