From bbb9365ce47a9c32d9f12ee4ea63a27775eede36 Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Mon, 9 Jul 2018 14:39:59 -0500 Subject: [PATCH] Build out Ubuntu 18.04 arm64 image Change-Id: I9b449a63489577c3f1a52c26bcb765e0f7ee9309 Signed-off-by: Jeremy Phelps --- templates/builder-aws.json | 5 +++-- templates/builder.json | 5 +++-- templates/docker.json | 5 +++-- templates/windows-builder.json | 5 +++-- vars/ubuntu-18.04-arm64.json | 9 +++++++++ 5 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 vars/ubuntu-18.04-arm64.json diff --git a/templates/builder-aws.json b/templates/builder-aws.json index e136e70..a7f1c29 100644 --- a/templates/builder-aws.json +++ b/templates/builder-aws.json @@ -14,13 +14,14 @@ "ssh_user": null, "distro": null, "cloud_user_data": null, - "ssh_proxy_host": "" + "ssh_proxy_host": "", + "arch": "x86_64" }, "builders": [ { "name": "aws", "access_key": "{{user `aws_access_key`}}", - "ami_name": "ZZCI - {{user `distro`}} - builder-aws - {{isotime \"20060102-150405.000\"}}", + "ami_name": "ZZCI - {{user `distro`}} - builder-aws - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-builder-aws-{{uuid}}", "instance_type": "{{user `aws_instance_type`}}", "region": "{{user `aws_region`}}", diff --git a/templates/builder.json b/templates/builder.json index 2b0fcb5..be9e2db 100644 --- a/templates/builder.json +++ b/templates/builder.json @@ -10,12 +10,13 @@ "cloud_tenant": null, "cloud_user_data": null, "ssh_user": null, - "ssh_proxy_host": "" + "ssh_proxy_host": "", + "arch": "x86_64" }, "builders": [ { "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - builder - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-builder-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", diff --git a/templates/docker.json b/templates/docker.json index 02a5407..dff4793 100644 --- a/templates/docker.json +++ b/templates/docker.json @@ -10,12 +10,13 @@ "cloud_tenant": null, "cloud_user_data": null, "ssh_user": null, - "ssh_proxy_host": "" + "ssh_proxy_host": "", + "arch": "x86_64" }, "builders": [ { "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - docker - {{isotime \"20060102-150405.000\"}}", + "image_name": "ZZCI - {{user `distro`}} - docker - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-docker-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", diff --git a/templates/windows-builder.json b/templates/windows-builder.json index c993408..a2bb8fb 100644 --- a/templates/windows-builder.json +++ b/templates/windows-builder.json @@ -8,12 +8,13 @@ "cloud_pass": null, "cloud_network": null, "cloud_tenant": null, - "cloud_user_data": null + "cloud_user_data": null, + "arch": "x86_64" }, "builders": [ { "name": "vexxhost", - "image_name": "{{user `distro`}} - win-builder - {{isotime \"20060102-150405.000\"}}", + "image_name": "{{user `distro`}} - win-builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", "instance_name": "{{user `distro`}}-win-builder-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", diff --git a/vars/ubuntu-18.04-arm64.json b/vars/ubuntu-18.04-arm64.json new file mode 100644 index 0000000..0e0f578 --- /dev/null +++ b/vars/ubuntu-18.04-arm64.json @@ -0,0 +1,9 @@ +{ + "source_ami_filter_name": "*ubuntu*16.04*", + "source_ami_filter_owner": "099720109477", + "base_image": "Ubuntu 18.04 LTS (arm64) [2018-04-29]", + "distro": "Ubuntu 18.04", + "ssh_user": "ubuntu", + "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh", + "arch": "arm64" +} -- 2.16.6