From c90329c5c93e5984fa27904c9ea2a3ed95d7afd3 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <ebportnoy@gmail.com>
Date: Mon, 17 Aug 2020 13:53:55 -0700
Subject: [PATCH] move adding python3-devel.x86_64 to bootstrap_os_packages to
 avoid potential race condition

---
 tests/letstest/scripts/bootstrap_os_packages.sh | 7 +++++++
 tests/letstest/targets.yaml                     | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/letstest/scripts/bootstrap_os_packages.sh b/tests/letstest/scripts/bootstrap_os_packages.sh
index 90e8216b5..83aeeb1c3 100755
--- a/tests/letstest/scripts/bootstrap_os_packages.sh
+++ b/tests/letstest/scripts/bootstrap_os_packages.sh
@@ -140,6 +140,13 @@ BootstrapRpmPython3() {
     python3-devel
   "
 
+  if ! $TOOL list python3-devel >/dev/null 2>&1; then
+    yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional
+    python_pkgs="$python_pkgs
+      python3-devel.x86_64
+    "
+  fi
+
   BootstrapRpmCommonBase "$python_pkgs"
 }
 
diff --git a/tests/letstest/targets.yaml b/tests/letstest/targets.yaml
index b585457e3..711053469 100644
--- a/tests/letstest/targets.yaml
+++ b/tests/letstest/targets.yaml
@@ -38,11 +38,6 @@ targets:
     type: centos
     virt: hvm
     user: ec2-user
-    userdata: |
-      #cloud-config
-      runcmd:
-        - yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional
-        - yum install -y python3-devel.x86_64
   - ami: ami-0c322300a1dd5dc79
     name: RHEL8
     type: centos