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

Remove unused image variants

Browse Source 
There is no difference anymore between the regular and Pro images.
Remove the definitions and stop building extra images.
This commit is contained in:
Kai Lueke 2022-05-03 20:30:42 +09:00
parent 91e96e1795
commit 6648df57a2
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build_library/vm_image_util.sh
View File

@ -8,9 +8,7 @@
VALID_IMG_TYPES=(
ami
ami_vmdk
ami_vmdk_pro
azure
azure_pro
brightbox
cloudsigma
cloudstack
@ -18,7 +16,6 @@ VALID_IMG_TYPES=(
digitalocean
exoscale
gce
gce_pro
hyperv
interoute
iso
@ -214,10 +211,6 @@ IMG_ami_OEM_USE=ec2
IMG_ami_vmdk_DISK_FORMAT=vmdk_stream
IMG_ami_vmdk_OEM_PACKAGE=oem-ec2-compat
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
IMG_openstack_DISK_FORMAT=qcow2
@ -254,12 +247,6 @@ IMG_gce_CONF_FORMAT=gce
IMG_gce_OEM_PACKAGE=oem-gce
IMG_gce_OEM_ACI=gce
## gce pro, image tarball
IMG_gce_pro_DISK_LAYOUT=vm
IMG_gce_pro_CONF_FORMAT=gce
IMG_gce_pro_OEM_PACKAGE=oem-gce
IMG_gce_pro_OEM_ACI=gce
## rackspace
IMG_rackspace_OEM_PACKAGE=oem-rackspace
IMG_rackspace_vhd_DISK_FORMAT=vhd
@ -287,11 +274,6 @@ IMG_azure_DISK_FORMAT=vhd_fixed
IMG_azure_DISK_LAYOUT=azure
IMG_azure_OEM_PACKAGE=oem-azure
## azure pro
IMG_azure_pro_DISK_FORMAT=vhd_fixed
IMG_azure_pro_DISK_LAYOUT=azure
IMG_azure_pro_OEM_PACKAGE=oem-azure
## hyper-v
IMG_hyperv_DISK_FORMAT=vhd
IMG_hyperv_OEM_PACKAGE=oem-hyperv

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

@ -1,11 +1,8 @@
ami
ami_vmdk
ami_vmdk_pro
azure
azure_gen2
azure_pro
gce
gce_pro
iso
pxe
qemu