Merge "Update lfit submodules"

5 files changed, 1 insertions, 16 deletions

diff --git a/global-jjb b/global-jjb
-Subproject 92449c24828b0dbd582637ce3d1d705390da412
+Subproject 1a5a6387044fbca79d9bad4d4037e086637f7b3
diff --git a/packer/common-packer b/packer/common-packer
-Subproject 3494343faf0fc4221bfdb6cefc8bc0af0452f98
+Subproject 3882ccbaf8789d13357c926b286f106d3195079
diff --git a/packer/vars/ubuntu-16.04-arm64.json b/packer/vars/ubuntu-16.04-arm64.json
deleted file mode 100644
index c387ad804..000000000
--- a/packer/vars/ubuntu-16.04-arm64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "arch": "arm64",
-  "base_image": "Ubuntu 16.04 LTS (arm64) [2018-10-27]",
-  "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
-  "distro": "Ubuntu 16.04",
-  "flavor": "lf-standard-1",
-  "source_ami_filter_name": "*ubuntu*16.04*",
-  "source_ami_filter_owner": "099720109477",
-  "ssh_user": "ubuntu"
-}
diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
deleted file mode 100644
index eadf41863..000000000
--- a/packer/vars/ubuntu-16.04.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "base_image": "Ubuntu 16.04 (2017-02-01) - LF upload",
-  "distro": "Ubuntu 16.04",
-  "ssh_user": "ubuntu",
-  "cloud_user_data": "provision/null_data.sh"
-}
diff --git a/packer/vars/ubuntu-18.04-arm64.json b/packer/vars/ubuntu-18.04-arm64.json
index 6b8b2b524..a2b8e4383 100644
--- a/packer/vars/ubuntu-18.04-arm64.json
+++ b/packer/vars/ubuntu-18.04-arm64.json
@@ -6,5 +6,6 @@
   "flavor": "lf-standard-1",
   "source_ami_filter_name": "*ubuntu*18.04*",
   "source_ami_filter_owner": "099720109477",
+  "docker_source_image": "arm64v8/ubuntu:18.04",
   "ssh_user": "ubuntu"
 }