mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-05 04:06:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

The LTS and Pro feature no longer requires the private bucket

Browse Source 
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 13:14:34 +05:30
parent 9a95f40f45
commit 8492dc9329
No known key found for this signature in database
GPG Key ID: B02399319CD05C8B
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/prerelease/azure.sh
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

12
jenkins/vms.sh
View File

@ -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