From 5b17a18355222c511b3d5e4442f01520765e8b8f Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Mon, 31 Jan 2022 15:52:43 -0800
Subject: [PATCH] CentOS & RHEL test farm fixes (#9188)

* update rhel 7 ami

* update bootstrap script

* update centos 8 image

* update centos 7 images

* add target comments
---
 letstest/scripts/bootstrap_os_packages.sh |  3 ++-
 letstest/targets/apache2_targets.yaml     |  4 +++-
 letstest/targets/targets.yaml             | 16 +++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/letstest/scripts/bootstrap_os_packages.sh b/letstest/scripts/bootstrap_os_packages.sh
index 3f4c6e30e..8c9b35c13 100755
--- a/letstest/scripts/bootstrap_os_packages.sh
+++ b/letstest/scripts/bootstrap_os_packages.sh
@@ -117,8 +117,9 @@ BootstrapRpmPython3() {
     python3-devel
   "
 
+  # We only expect this branch to be taken on RHEL 7.
   if ! sudo $TOOL list 'python3*-devel' >/dev/null 2>&1; then
-    sudo yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional
+    sudo yum-config-manager --enable rhel-7-server-rhui-extras-rpms rhel-7-server-rhui-optional-rpms
   fi
 
   BootstrapRpmCommonBase "$python_pkgs"
diff --git a/letstest/targets/apache2_targets.yaml b/letstest/targets/apache2_targets.yaml
index b81507e8b..1812b3645 100644
--- a/letstest/targets/apache2_targets.yaml
+++ b/letstest/targets/apache2_targets.yaml
@@ -30,7 +30,9 @@ targets:
     user: admin
   #-----------------------------------------------------------------------------
   # CentOS
-  - ami: ami-9887c6e7
+  # This AMI was found on
+  # https://web.archive.org/web/20211126215532/https://wiki.centos.org/Cloud/AWS.
+  - ami: ami-00e87074e52e6c9f9
     name: centos7
     type: centos
     virt: hvm
diff --git a/letstest/targets/targets.yaml b/letstest/targets/targets.yaml
index b3962ffaa..35379c2cc 100644
--- a/letstest/targets/targets.yaml
+++ b/letstest/targets/targets.yaml
@@ -32,8 +32,10 @@ targets:
     user: admin
     machine_type: a1.medium
   #-----------------------------------------------------------------------------
-  # Other Redhat Distros
-  - ami: ami-0916c408cb02e310b
+  # RHEL
+  # These AMIs were found using the commands given at
+  # https://web.archive.org/web/20220129184532/https://access.redhat.com/solutions/15356.
+  - ami: ami-005b7876121b7244d
     name: RHEL7
     type: centos
     virt: hvm
@@ -45,15 +47,15 @@ targets:
     user: ec2-user
   #-----------------------------------------------------------------------------
   # CentOS
-  # These Marketplace AMIs must, irritatingly, have their terms manually
-  # agreed to on the AWS marketplace site for any new AWS account using them...
-  - ami: ami-9887c6e7
+  # These AMIs were found on
+  # https://web.archive.org/web/20211126215532/https://wiki.centos.org/Cloud/AWS.
+  - ami: ami-00e87074e52e6c9f9
     name: centos7
     type: centos
     virt: hvm
     user: centos
-  - ami: ami-01ca03df4a6012157
-    name: centos8
+  - ami: ami-0ee70e88eed976a1b
+    name: centos_stream8
     type: centos
     virt: hvm
     user: centos