mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-16 14:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335 from flatcar-linux/sayan/no-upload-to-private-ii

Browse Source 
The LTS and Pro feature no longer requires the private bucket
This commit is contained in:
Sayan Chowdhury 2022-05-24 13:22:21 +05:30 committed by GitHub
commit f615aac4a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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="" AZURE_CATEGORY_OPT=""
if [[ "${IS_NON_SPONSORED}" == true ]] if [[ "${IS_NON_SPONSORED}" == true ]]
then then
AZURE_CATEGORY_OPT="--azure-category=pro --private" AZURE_CATEGORY_OPT="--azure-category=pro"
fi fi
rm -f images.json rm -f images.json

12
jenkins/vms.sh
View File

@ -104,15 +104,6 @@ if [[ "${FORMATS}" == *"azure_gen2"* ]] ; then
fi fi
for FORMAT in ${FORMATS}; do 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" COMPRESSION_FORMAT="bz2"
if [[ "${FORMAT}" =~ ^(openstack|openstack_mini|digitalocean)$ ]];then if [[ "${FORMAT}" =~ ^(openstack|openstack_mini|digitalocean)$ ]];then
@ -131,6 +122,5 @@ for FORMAT in ${FORMATS}; do
--download_root="${DOWNLOAD_ROOT}" \ --download_root="${DOWNLOAD_ROOT}" \
--upload_root="${UPLOAD_ROOT}" \ --upload_root="${UPLOAD_ROOT}" \
--image_compression_formats="${COMPRESSION_FORMAT}" \ --image_compression_formats="${COMPRESSION_FORMAT}" \
--upload \ --upload
${PRIVATE_UPLOAD_OPT}
done done