mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 21:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from kinvolk/kai/aws-pro

Browse Source 
Add AWS Pro OEM type
This commit is contained in:
Kai Lüke 2020-12-15 11:14:25 +01:00 committed by GitHub
commit ef631cd7af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_library/vm_image_util.sh
View File

@ -8,6 +8,7 @@
VALID_IMG_TYPES=( VALID_IMG_TYPES=(
ami ami
ami_vmdk ami_vmdk
ami_vmdk_pro
azure azure
azure_pro azure_pro
brightbox brightbox
@ -212,6 +213,10 @@ IMG_ami_OEM_USE=ec2
IMG_ami_vmdk_DISK_FORMAT=vmdk_stream IMG_ami_vmdk_DISK_FORMAT=vmdk_stream
IMG_ami_vmdk_OEM_PACKAGE=oem-ec2-compat IMG_ami_vmdk_OEM_PACKAGE=oem-ec2-compat
IMG_ami_vmdk_OEM_USE=ec2 IMG_ami_vmdk_OEM_USE=ec2
# AWS Pro
IMG_ami_vmdk_pro_DISK_FORMAT=vmdk_stream
IMG_ami_vmdk_pro_OEM_PACKAGE=oem-ec2-compat
IMG_ami_vmdk_pro_OEM_USE=ec2
## openstack, supports ec2's metadata format so use oem-ec2-compat ## openstack, supports ec2's metadata format so use oem-ec2-compat
IMG_openstack_DISK_FORMAT=qcow2 IMG_openstack_DISK_FORMAT=qcow2

1
jenkins/formats-amd64-usr.txt
View File

@ -1,5 +1,6 @@
ami ami
ami_vmdk ami_vmdk
ami_vmdk_pro
azure azure
azure_pro azure_pro
gce gce

2
jenkins/vm.sh
View File

@ -44,7 +44,7 @@ img=src/flatcar_production_image.bin
enter lbunzip2 -k -f "/mnt/host/source/${img}.bz2" enter lbunzip2 -k -f "/mnt/host/source/${img}.bz2"
PRIVATE_UPLOAD_OPT="" PRIVATE_UPLOAD_OPT=""
if [[ "${FORMAT}" == 'azure_pro' ]] if [[ "${FORMAT}" == 'azure_pro' ]] || [[ "${FORMAT}" == 'ami_vmdk_pro' ]]
then then
PRIVATE_UPLOAD_OPT="--private" PRIVATE_UPLOAD_OPT="--private"
UPLOAD_ROOT=${UPLOAD_PRIVATE_ROOT} UPLOAD_ROOT=${UPLOAD_PRIVATE_ROOT}