From: Jessica Wagantall Date: Wed, 16 Jun 2021 17:49:10 +0000 (-0700) Subject: Update lfit submodules X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5c0121f1c43328e6922e3a7f09216c509add8ed1;p=ci-management.git Update lfit submodules - Update to fetch the latest changes - Update global-jjb and common-packer - Update packer/vars/ubuntu-18.04-arm64.json - Remove deprecated Ubuntu-16 var files Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall Change-Id: I7b7de1255a0a25de8476fcdf7cfd73ce0a2d42e2 --- diff --git a/global-jjb b/global-jjb index 92449c248..1a5a63870 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 92449c24828b0dbd582637ce3d1d705390da4126 +Subproject commit 1a5a6387044fbca79d9bad4d4037e086637f7b30 diff --git a/packer/common-packer b/packer/common-packer index 3494343fa..3882ccbaf 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 3494343faf0fc4221bfdb6cefc8bc0af0452f980 +Subproject commit 3882ccbaf8789d13357c926b286f106d31950792 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" }