From f84ca169e50471eee35d25890ec9a8b2b187d888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Tue, 8 Dec 2020 19:16:24 +0100
Subject: [PATCH] Add AWS Pro OEM type

This is the initial creation of an AWS Pro image coming with support,
and features added on top of it.
---
 build_library/vm_image_util.sh | 5 +++++
 jenkins/formats-amd64-usr.txt  | 1 +
 jenkins/vm.sh                  | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 3834a2e4b7..957057dd4f 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -8,6 +8,7 @@
 VALID_IMG_TYPES=(
     ami
     ami_vmdk
+    ami_vmdk_pro
     azure
     azure_pro
     brightbox
@@ -212,6 +213,10 @@ 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
diff --git a/jenkins/formats-amd64-usr.txt b/jenkins/formats-amd64-usr.txt
index 33d48e4123..70f546843e 100644
--- a/jenkins/formats-amd64-usr.txt
+++ b/jenkins/formats-amd64-usr.txt
@@ -1,5 +1,6 @@
 ami
 ami_vmdk
+ami_vmdk_pro
 azure
 azure_pro
 gce
diff --git a/jenkins/vm.sh b/jenkins/vm.sh
index 5c11f9242e..34bdae2f61 100644
--- a/jenkins/vm.sh
+++ b/jenkins/vm.sh
@@ -44,7 +44,7 @@ img=src/flatcar_production_image.bin
 enter lbunzip2 -k -f "/mnt/host/source/${img}.bz2"
 
 PRIVATE_UPLOAD_OPT=""
-if [[ "${FORMAT}" == 'azure_pro' ]]
+if [[ "${FORMAT}" == 'azure_pro' ]] || [[ "${FORMAT}" == 'ami_vmdk_pro' ]]
 then
   PRIVATE_UPLOAD_OPT="--private"
   UPLOAD_ROOT=${UPLOAD_PRIVATE_ROOT}