From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Mon, 12 Apr 2021 16:06:58 +0000 (+0000)
Subject: Merge "Use official CentOS & Ubuntu images via prodId"
X-Git-Tag: v0.8.0~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=7ebaaca872c2ca9c63a09621b961c9973938f903;p=releng%2Fcommon-packer.git

Merge "Use official CentOS & Ubuntu images via prodId"
---

7ebaaca872c2ca9c63a09621b961c9973938f903
diff --cc vars/centos-7.json
index cec0955,151b7bf..5b39276
--- a/vars/centos-7.json
+++ b/vars/centos-7.json
@@@ -1,9 -1,9 +1,10 @@@
  {
-   "source_ami_filter_name": "*CentOS Linux 7*HVM*",
-   "source_ami_filter_owner": "679593333241",
+   "source_ami_filter_name": "*CentOS-7*",
+   "source_ami_filter_owner": "aws-marketplace",
+   "source_ami_filter_product_code": "cvugziknvmxgqna9noibqnnsy",
    "base_image": "LF - CentOS 7.2003 (2020-04-22)",
    "distro": "CentOS 7",
 +  "docker_source_image": "centos:7",
    "ssh_user": "centos",
    "cloud_user_data": "common-packer/provision/rh-user_data.sh"
  }
diff --cc vars/centos-8.json
index 1042cb2,6c7ff10..1f05970
--- a/vars/centos-8.json
+++ b/vars/centos-8.json
@@@ -1,9 -1,9 +1,10 @@@
  {
-   "source_ami_filter_name": "*CentOS Linux 8*HVM*",
-   "source_ami_filter_owner": "679593333241",
+   "source_ami_filter_name": "*CentOS-8*",
+   "source_ami_filter_owner": "aws-marketplace",
+   "source_ami_filter_product_code": "47k9ia2igxpcce2bzo8u3kj03",
    "base_image": "CentOS 8.2 (x86_64) [2020-06-11]",
    "distro": "CentOS 8",
 +  "docker_source_image": "centos:8",
    "ssh_user": "centos",
    "cloud_user_data": "common-packer/provision/rh-user_data.sh"
  }
diff --cc vars/ubuntu-16.04.json
index 0a4bc8e,3289e4b..0c69a53
--- a/vars/ubuntu-16.04.json
+++ b/vars/ubuntu-16.04.json
@@@ -1,9 -1,9 +1,10 @@@
  {
-   "source_ami_filter_name": "*ubuntu*16.04*",
-   "source_ami_filter_owner": "099720109477",
+   "source_ami_filter_name": "ubuntu/images/*ubuntu-xenial-16.04-amd64-server*",
+   "source_ami_filter_owner": "aws-marketplace",
+   "source_ami_filter_product_code": "csv6h7oyg29b7epjzg7qdr7no",
    "base_image": "LF - Ubuntu 16.04 LTS (2019-12-11)",
    "distro": "Ubuntu 16.04",
 +  "docker_source_image": "ubuntu:16.04",
    "ssh_user": "ubuntu",
    "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh"
  }
diff --cc vars/ubuntu-18.04.json
index 6b5450d,67c4d40..28e3dd8
--- a/vars/ubuntu-18.04.json
+++ b/vars/ubuntu-18.04.json
@@@ -1,9 -1,9 +1,10 @@@
  {
-   "source_ami_filter_name": "*ubuntu*18.04*",
-   "source_ami_filter_owner": "099720109477",
+   "source_ami_filter_name": "ubuntu/images/*ubuntu-bionic-18.04-amd64-server-*",
+   "source_ami_filter_owner": "aws-marketplace",
+   "source_ami_filter_product_code": "3iplms73etrdhxdepv72l6ywj",
    "base_image": "LF - Ubuntu 18.04 LTS (2020-07-29)",
    "distro": "Ubuntu 18.04",
 +  "docker_source_image": "ubuntu:18.04",
    "ssh_user": "ubuntu",
    "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh"
  }