From 8f4fcea85643888454c3850b1aaf3d0d2d623b2f Mon Sep 17 00:00:00 2001
From: Leo Gallego <993814+leogallego@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:41:41 -0300
Subject: [PATCH 01/32] Update execution-environment.yml

---
 network-netbox-eda-ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network-netbox-eda-ee/execution-environment.yml b/network-netbox-eda-ee/execution-environment.yml
index a9d2ba5..81ab81d 100644
--- a/network-netbox-eda-ee/execution-environment.yml
+++ b/network-netbox-eda-ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 3
 images:
   base_image:
-    name: registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8:latest
+    name: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8:latest
 
 dependencies:
     galaxy: ansible-collections.yml

From 7112c0b04ae2d65083186da0a181a096f55d08e4 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:12:43 -0400
Subject: [PATCH 02/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index 14eb988..97f1b2a 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 1
 
 build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8'
+  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8'
 
 dependencies:
   galaxy: requirements.yml

From 9b2c395cb1b97b69bf87d2cfa68022e99a27e4af Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:13:52 -0400
Subject: [PATCH 03/32] Update requirements.yml

---
 aws_ee/requirements.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aws_ee/requirements.yml b/aws_ee/requirements.yml
index 450fc94..c7e5365 100644
--- a/aws_ee/requirements.yml
+++ b/aws_ee/requirements.yml
@@ -2,6 +2,8 @@
 collections:
   - name: servicenow.itsm
   - name: amazon.aws
+  - name: ansible.controller
+  - name: ansible.posix
   - name: awx.awx
   - name: amazon.cloud
   - name: community.aws

From 129c0ad72d5c195da026690522f1fa6759e092d1 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 08:36:40 -0400
Subject: [PATCH 04/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index 97f1b2a..14eb988 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 1
 
 build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8'
+  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8'
 
 dependencies:
   galaxy: requirements.yml

From 279caa346920e81dbce16f3c5c9d03e0d436cf5e Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 08:56:37 -0400
Subject: [PATCH 05/32] Update requirements.txt

---
 aws_ee/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws_ee/requirements.txt b/aws_ee/requirements.txt
index af7a38a..547916e 100644
--- a/aws_ee/requirements.txt
+++ b/aws_ee/requirements.txt
@@ -1,3 +1,4 @@
 pysnow
 requests
 netaddr
+boto3

From 0d6436f552b343099bb713e24669f4634557214e Mon Sep 17 00:00:00 2001
From: sean cavanaugh <sean@cavanaugh.pro>
Date: Thu, 31 Oct 2024 09:00:32 -0400
Subject: [PATCH 06/32] Update requirements.txt

adding netaddr
---
 workshop_ee/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workshop_ee/requirements.txt b/workshop_ee/requirements.txt
index 81af326..f9d19c1 100644
--- a/workshop_ee/requirements.txt
+++ b/workshop_ee/requirements.txt
@@ -1 +1,2 @@
 petname==2.6
+netaddr
\ No newline at end of file

From b6ef9f8cde93062458dcdd2873f12b4f0484cdc9 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:00:51 -0400
Subject: [PATCH 07/32] Update requirements.yml

---
 aws_ee/requirements.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aws_ee/requirements.yml b/aws_ee/requirements.yml
index c7e5365..bcbcc1a 100644
--- a/aws_ee/requirements.yml
+++ b/aws_ee/requirements.yml
@@ -2,7 +2,6 @@
 collections:
   - name: servicenow.itsm
   - name: amazon.aws
-  - name: ansible.controller
   - name: ansible.posix
   - name: awx.awx
   - name: amazon.cloud

From 227aed4513037ee471db85b832fbb2066efa31e8 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:02:36 -0400
Subject: [PATCH 08/32] Update requirements.txt

---
 aws_ee/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws_ee/requirements.txt b/aws_ee/requirements.txt
index 547916e..3d6f03f 100644
--- a/aws_ee/requirements.txt
+++ b/aws_ee/requirements.txt
@@ -2,3 +2,4 @@ pysnow
 requests
 netaddr
 boto3
+botocore

From 1eed27c5745ee38c7b84bdbee74a77089d60b503 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:04:36 -0400
Subject: [PATCH 09/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index 14eb988..fc517ee 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 1
 
 build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8'
+  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8'
 
 dependencies:
   galaxy: requirements.yml
@@ -10,6 +10,8 @@ dependencies:
   system: bindep.txt
 
 additional_build_steps:
+  prepend: |
+    RUN pip3 install --upgrade pip
   append:
     - RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/awscliv2.zip"
     - RUN unzip /awscliv2.zip -d /aws

From 28f67697456b94a51fde87407ccd78b4a3875b61 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:05:54 -0400
Subject: [PATCH 10/32] Update requirements.yml

---
 aws_ee/requirements.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws_ee/requirements.yml b/aws_ee/requirements.yml
index bcbcc1a..9076fdf 100644
--- a/aws_ee/requirements.yml
+++ b/aws_ee/requirements.yml
@@ -3,6 +3,7 @@ collections:
   - name: servicenow.itsm
   - name: amazon.aws
   - name: ansible.posix
+  - name: ansible.controller
   - name: awx.awx
   - name: amazon.cloud
   - name: community.aws

From 7a39cf54eec33a1c35c7023b984e6db1e155a021 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:15:05 -0400
Subject: [PATCH 11/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index fc517ee..d2ee1de 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -11,7 +11,7 @@ dependencies:
 
 additional_build_steps:
   prepend: |
-    RUN pip3 install --upgrade pip
+    RUN pip3 install --upgrade pip setuptools boto3 yum-utils
   append:
     - RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/awscliv2.zip"
     - RUN unzip /awscliv2.zip -d /aws

From 446c5596f9392b2f6792ac46c9e456f86e0421cb Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:15:33 -0400
Subject: [PATCH 12/32] Update requirements.txt

---
 aws_ee/requirements.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/aws_ee/requirements.txt b/aws_ee/requirements.txt
index 3d6f03f..af7a38a 100644
--- a/aws_ee/requirements.txt
+++ b/aws_ee/requirements.txt
@@ -1,5 +1,3 @@
 pysnow
 requests
 netaddr
-boto3
-botocore

From 918a1ccc211523d6b2cdf756764b539212828400 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:25:25 -0400
Subject: [PATCH 13/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index d2ee1de..6285def 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 1
 
 build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8'
+  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8'
 
 dependencies:
   galaxy: requirements.yml

From fb3576a4841c2b25bbc70b716678a9674f929e59 Mon Sep 17 00:00:00 2001
From: sean cavanaugh <sean@cavanaugh.pro>
Date: Thu, 31 Oct 2024 09:41:35 -0400
Subject: [PATCH 14/32] Update execution-environment.yml

move to supported
---
 workshop_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workshop_ee/execution-environment.yml b/workshop_ee/execution-environment.yml
index 88707c6..25878db 100644
--- a/workshop_ee/execution-environment.yml
+++ b/workshop_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 3
 images:
   base_image:
-    name: 'registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel8:latest'
+    name: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8:latest'
 
 additional_build_files:
     # Can be used to resolve collections from private automation hub

From 99abfdeac697b46158ee58342af7ecebf21d8026 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:44:41 -0400
Subject: [PATCH 15/32] Update requirements.yml

remove ansible.controller
---
 aws_ee/requirements.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aws_ee/requirements.yml b/aws_ee/requirements.yml
index 9076fdf..bcbcc1a 100644
--- a/aws_ee/requirements.yml
+++ b/aws_ee/requirements.yml
@@ -3,7 +3,6 @@ collections:
   - name: servicenow.itsm
   - name: amazon.aws
   - name: ansible.posix
-  - name: ansible.controller
   - name: awx.awx
   - name: amazon.cloud
   - name: community.aws

From 803f62ea030e103e00c88cb38ab22f6d783a475c Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:58:41 -0400
Subject: [PATCH 16/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index 6285def..ed2acd4 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -11,7 +11,7 @@ dependencies:
 
 additional_build_steps:
   prepend: |
-    RUN pip3 install --upgrade pip setuptools boto3 yum-utils
+    RUN pip3 install --upgrade pip setuptools
   append:
     - RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/awscliv2.zip"
     - RUN unzip /awscliv2.zip -d /aws

From 5da8580a22189137d23146eba27adb8a7f7fcd36 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:06:56 -0400
Subject: [PATCH 17/32] Create ansible.cfg

---
 aws_ee/ansible.cfg | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 aws_ee/ansible.cfg

diff --git a/aws_ee/ansible.cfg b/aws_ee/ansible.cfg
new file mode 100644
index 0000000..186432b
--- /dev/null
+++ b/aws_ee/ansible.cfg
@@ -0,0 +1,9 @@
+[galaxy]
+server_list = automation_hub, release_galaxy
+
+[galaxy_server.automation_hub]
+url=https://console.redhat.com/api/automation-hub/content/published/
+auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+
+[galaxy_server.release_galaxy]
+url=https://galaxy.ansible.com/

From 77d9bab2076e09cbd37198a97063ab02192fcebc Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:11:20 -0400
Subject: [PATCH 18/32] Update execution-environment.yml

update to v3 execution-environment file.
---
 aws_ee/execution-environment.yml | 35 +++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index ed2acd4..9f09acc 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -1,20 +1,31 @@
 ---
-version: 1
-
-build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8'
+version: 3
+images:
+  base_image:
+    name: registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8:latest
 
 dependencies:
   galaxy: requirements.yml
   python: requirements.txt
   system: bindep.txt
 
+additional_build_files:
+    # Can be used to resolve collections from private automation hub
+    - src: ansible.cfg
+      dest: configs
+
+options:
+    package_manager_path: /usr/bin/microdnf
+
 additional_build_steps:
-  prepend: |
-    RUN pip3 install --upgrade pip setuptools
-  append:
-    - RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/awscliv2.zip"
-    - RUN unzip /awscliv2.zip -d /aws
-    - RUN /aws/aws/install
-    - RUN curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/linux_64bit/session-manager-plugin.rpm" -o "/session-manager-plugin.rpm"
-    - RUN dnf install -y /session-manager-plugin.rpm
+    prepend_base:
+        - RUN $PYCMD -m pip install --upgrade pip setuptools 
+    prepend_galaxy:
+        # Add custom ansible.cfg which defines collection install sources
+        - ADD _build/configs/ansible.cfg /etc/ansible/ansible.cfg
+        # AH_TOKEN is passed into the build command using a --build-arg
+        # accept this as an ARG during this stage to reference later
+        - ARG AH_TOKEN
+        # Use the above ARG to define an environment variable holding
+        # the token for resolving private collections
+        - ENV ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN=$AH_TOKEN

From 2140b84cf6b883fafb68470164984b89234c979f Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:12:44 -0400
Subject: [PATCH 19/32] Update requirements.yml

---
 aws_ee/requirements.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aws_ee/requirements.yml b/aws_ee/requirements.yml
index bcbcc1a..f3851fd 100644
--- a/aws_ee/requirements.yml
+++ b/aws_ee/requirements.yml
@@ -2,6 +2,8 @@
 collections:
   - name: servicenow.itsm
   - name: amazon.aws
+  - name: ansible.controller
+  - name: ansible.gateway 
   - name: ansible.posix
   - name: awx.awx
   - name: amazon.cloud

From 4f4b94d7b51134b8117734d5b0617753ba233051 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:19:17 -0400
Subject: [PATCH 20/32] Update requirements.yml

ansible.platform
---
 aws_ee/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/requirements.yml b/aws_ee/requirements.yml
index f3851fd..b75a676 100644
--- a/aws_ee/requirements.yml
+++ b/aws_ee/requirements.yml
@@ -3,7 +3,7 @@ collections:
   - name: servicenow.itsm
   - name: amazon.aws
   - name: ansible.controller
-  - name: ansible.gateway 
+  - name: ansible.platform
   - name: ansible.posix
   - name: awx.awx
   - name: amazon.cloud

From 118735976ebfa7ac1e1cb1ce3fb2730c993f30ba Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:32:34 -0400
Subject: [PATCH 21/32] Update requirements.txt

---
 aws_ee/requirements.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/aws_ee/requirements.txt b/aws_ee/requirements.txt
index af7a38a..443129d 100644
--- a/aws_ee/requirements.txt
+++ b/aws_ee/requirements.txt
@@ -1,3 +1,10 @@
 pysnow
 requests
 netaddr
+#
+# When updating the minimal requirements please also update
+# - tests/unit/constraints.txt
+# - tests/integration/constraints.txt
+# - tests/integration/targets/setup_botocore_pip
+botocore>=1.31.0
+boto3>=1.28.0

From b06c16420bbce023eefed48cf0b5daa4dc0e1106 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:33:07 -0400
Subject: [PATCH 22/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index 9f09acc..02d6216 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 3
 images:
   base_image:
-    name: registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8:latest
+    name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel8:latest
 
 dependencies:
   galaxy: requirements.yml

From 5b1df6dc0f594068c82b624c90e3ed6bf868bf2f Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:45:17 -0400
Subject: [PATCH 23/32] Update requirements.yml

---
 aws_ee/requirements.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aws_ee/requirements.yml b/aws_ee/requirements.yml
index b75a676..1fb10ff 100644
--- a/aws_ee/requirements.yml
+++ b/aws_ee/requirements.yml
@@ -9,4 +9,3 @@ collections:
   - name: amazon.cloud
   - name: community.aws
   - name: cloud.terraform
-    version: 1.0.0

From 214d9181c4841f0b10c47380b5d2446937fc5d34 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:53:01 -0400
Subject: [PATCH 24/32] Update execution-environment.yml

use support image
---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index 02d6216..9f09acc 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 3
 images:
   base_image:
-    name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel8:latest
+    name: registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8:latest
 
 dependencies:
   galaxy: requirements.yml

From bcc287a2702cb6040a487eeeecc73c0266f58603 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:06:54 -0400
Subject: [PATCH 25/32] Update bindep.txt

Update bindep.txt
---
 aws_ee/bindep.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws_ee/bindep.txt b/aws_ee/bindep.txt
index ddaedfe..9d9b88f 100644
--- a/aws_ee/bindep.txt
+++ b/aws_ee/bindep.txt
@@ -1,2 +1,3 @@
 unzip
 dnf
+systemd-devel [compile platform:rhel-8]

From d7ae94c848f96ede27404d14aa053e26f648407b Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:17:33 -0400
Subject: [PATCH 26/32] Update bindep.txt

Update bindep.txt
---
 aws_ee/bindep.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws_ee/bindep.txt b/aws_ee/bindep.txt
index 9d9b88f..f93844a 100644
--- a/aws_ee/bindep.txt
+++ b/aws_ee/bindep.txt
@@ -1,3 +1,4 @@
 unzip
 dnf
 systemd-devel [compile platform:rhel-8]
+python-devel

From 5b973a48d72d94b20c952ec579db19f8b01aa85b Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:21:40 -0400
Subject: [PATCH 27/32] Update bindep.txt

Update bindep.txt
---
 aws_ee/bindep.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/bindep.txt b/aws_ee/bindep.txt
index f93844a..d815e95 100644
--- a/aws_ee/bindep.txt
+++ b/aws_ee/bindep.txt
@@ -1,4 +1,4 @@
 unzip
 dnf
 systemd-devel [compile platform:rhel-8]
-python-devel
+python3-devel

From 8faf83d22709d0cf55836762aa614f8ee1ce1dd1 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:30:40 -0400
Subject: [PATCH 28/32] Update bindep.txt

Update bindep.txt
---
 aws_ee/bindep.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aws_ee/bindep.txt b/aws_ee/bindep.txt
index d815e95..981a384 100644
--- a/aws_ee/bindep.txt
+++ b/aws_ee/bindep.txt
@@ -1,4 +1,6 @@
 unzip
 dnf
-systemd-devel [compile platform:rhel-8]
-python3-devel
+systemd-devel [platform:rpm]
+python3.11-devel [platform:rpm]
+pkgconf-pkg-config [platform:rpm]
+gcc [platform:rpm]

From a9d3c74726e0bed57c78d24faf3351364c3d81fc Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:35:51 -0400
Subject: [PATCH 29/32] Update bindep.txt

Update bindep.txt
---
 aws_ee/bindep.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aws_ee/bindep.txt b/aws_ee/bindep.txt
index 981a384..b2bbcf1 100644
--- a/aws_ee/bindep.txt
+++ b/aws_ee/bindep.txt
@@ -1,6 +1,6 @@
 unzip
 dnf
-systemd-devel [platform:rpm]
-python3.11-devel [platform:rpm]
-pkgconf-pkg-config [platform:rpm]
-gcc [platform:rpm]
+systemd-devel [compile platform:rhel-8]
+python3.11-devel [compile platform:rhel-8]
+pkgconf-pkg-config [compile platform:rhel-8]
+gcc [compile platform:rhel-8]

From dac936b08c97a57910acf2d53cc2d960237485e8 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:43:05 -0400
Subject: [PATCH 30/32] Update requirements.txt

Update requirements.txt
---
 aws_ee/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws_ee/requirements.txt b/aws_ee/requirements.txt
index 443129d..95c4a21 100644
--- a/aws_ee/requirements.txt
+++ b/aws_ee/requirements.txt
@@ -8,3 +8,4 @@ netaddr
 # - tests/integration/targets/setup_botocore_pip
 botocore>=1.31.0
 boto3>=1.28.0
+pytz

From 9164a10aa61fb35999fa26c85be873921ce0aef2 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 12:15:22 -0400
Subject: [PATCH 31/32] Update requirements.txt

---
 aws_ee/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aws_ee/requirements.txt b/aws_ee/requirements.txt
index 95c4a21..443129d 100644
--- a/aws_ee/requirements.txt
+++ b/aws_ee/requirements.txt
@@ -8,4 +8,3 @@ netaddr
 # - tests/integration/targets/setup_botocore_pip
 botocore>=1.31.0
 boto3>=1.28.0
-pytz

From b3c70a60930a688e3c71add1109b48f8f9db56c4 Mon Sep 17 00:00:00 2001
From: Hicham Mourad <43329991+HichamMourad@users.noreply.github.com>
Date: Thu, 31 Oct 2024 12:16:08 -0400
Subject: [PATCH 32/32] Update execution-environment.yml

---
 aws_ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws_ee/execution-environment.yml b/aws_ee/execution-environment.yml
index 9f09acc..02d6216 100644
--- a/aws_ee/execution-environment.yml
+++ b/aws_ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 3
 images:
   base_image:
-    name: registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8:latest
+    name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel8:latest
 
 dependencies:
   galaxy: requirements.yml