From: Anil Belur <abelur@linuxfoundation.org>
Date: Fri, 4 Jun 2021 02:50:17 +0000 (+1000)
Subject: Feat: Add support for Docker builder on arm64
X-Git-Tag: v0.9.0~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F67878%2F1;p=releng%2Fcommon-packer.git

Feat: Add support for Docker builder on arm64

The original change e24c07369afd514abdf3efb0f596f772261412ed
missed updating arm64 var files and Ubuntu 20:04 var file,
while the builder template were updated. This breaks the
packer verify jobs.

Error:
* required variable not set: docker_source_image'

Issue: RELENG-3717
Change-Id: I1f3acf1479bf7a4ab271f747da5261ee2619e566
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/releasenotes/notes/docker-support-arm64-bf67998d3d59e4b2.yaml b/releasenotes/notes/docker-support-arm64-bf67998d3d59e4b2.yaml
new file mode 100644
index 0000000..578d8de
--- /dev/null
+++ b/releasenotes/notes/docker-support-arm64-bf67998d3d59e4b2.yaml
@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Feat: Add support for Docker builder on arm64
+
+    The original change e24c07369afd514abdf3efb0f596f772261412ed
+    missed updating arm64 var files, while the builder templates were
+    updated. This breaks the packer verify jobs.
+
+    Error:
+        required variable not set: docker_source_image'
diff --git a/vars/centos-7-arm64.json b/vars/centos-7-arm64.json
index 42e212f..e86dff0 100644
--- a/vars/centos-7-arm64.json
+++ b/vars/centos-7-arm64.json
@@ -3,6 +3,7 @@
   "base_image": "CentOS 7 aarch64 (2018-07-12) - LF upload",
   "cloud_user_data": "common-packer/provision/rh-user_data.sh",
   "distro": "CentOS 7",
+  "docker_source_image": "arm64v8/centos:7",
   "flavor": "v3-standard-2",
   "source_ami_filter_name": "*CentOS Linux 7*HVM*",
   "source_ami_filter_owner": "679593333241",
diff --git a/vars/ubuntu-16.04-arm64.json b/vars/ubuntu-16.04-arm64.json
index 5db3d4c..d591eaa 100644
--- a/vars/ubuntu-16.04-arm64.json
+++ b/vars/ubuntu-16.04-arm64.json
@@ -3,6 +3,7 @@
   "base_image": "Ubuntu 16.04 LTS (arm64) [2020-03-11]",
   "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
   "distro": "Ubuntu 16.04",
+  "docker_source_image": "arm64v8/ubuntu:16.04",
   "flavor": "v3-standard-2",
   "source_ami_filter_name": "*ubuntu*16.04*",
   "source_ami_filter_owner": "099720109477",
diff --git a/vars/ubuntu-18.04-arm64.json b/vars/ubuntu-18.04-arm64.json
index 257b486..d250a0b 100644
--- a/vars/ubuntu-18.04-arm64.json
+++ b/vars/ubuntu-18.04-arm64.json
@@ -3,6 +3,7 @@
   "base_image": "Ubuntu 18.04 LTS (arm64) [2020-02-18]",
   "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
   "distro": "Ubuntu 18.04",
+  "docker_source_image": "arm64v8/ubuntu:18.04",
   "flavor": "v3-standard-2",
   "source_ami_filter_name": "*ubuntu*18.04*",
   "source_ami_filter_owner": "099720109477",
diff --git a/vars/ubuntu-20.04-arm64.json b/vars/ubuntu-20.04-arm64.json
index fd40a8d..338d904 100644
--- a/vars/ubuntu-20.04-arm64.json
+++ b/vars/ubuntu-20.04-arm64.json
@@ -3,6 +3,7 @@
   "base_image": "LF - Ubuntu 20.04 LTS (arm64) [2020-08-04]",
   "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
   "distro": "Ubuntu 20.04",
+  "docker_source_image": "arm64v8/ubuntu:20.04",
   "flavor": "v3-standard-2",
   "source_ami_filter_name": "*ubuntu*20.04*",
   "source_ami_filter_owner": "099720109477",
diff --git a/vars/ubuntu-20.04.json b/vars/ubuntu-20.04.json
index e56a441..17c67b4 100644
--- a/vars/ubuntu-20.04.json
+++ b/vars/ubuntu-20.04.json
@@ -3,6 +3,7 @@
   "source_ami_filter_owner": "099720109477",
   "base_image": "LF - Ubuntu 20.04 LTS (2020-08-04)",
   "distro": "Ubuntu 20.04",
+  "docker_source_image": "ubuntu:20.04",
   "ssh_user": "ubuntu",
   "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh"
 }