From 83eb45b810ebc3bfd32f1d3d94fdcc8f3fa2f4c8 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 24 May 2022 15:53:29 +0530 Subject: [PATCH] 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 --- 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 5ecc4739cf..d6808c946c 100755 --- a/jenkins/vms.sh +++ b/jenkins/vms.sh @@ -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