Fix build errors and standardize configs

branic · Dec 12, 2024 · f4053da · f4053da
1 parent 0765a4d
commit f4053da
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/ansible-ee/execution-environment.yml b/ansible-ee/execution-environment.yml
@@ -3,7 +3,7 @@ version: 3
 
 images:
   base_image:
-    name: quay.io/fedora/fedora-minimal:latest
+    name: quay.io/fedora/fedora:latest
 
 additional_build_files:
   - dest: configs
@@ -18,8 +18,8 @@ dependencies:
   ansible_runner:
     package_pip: ansible-runner
   system:
-    - openssh-clients [platform:rpm]
-    - sshpass [platform:rpm]
+    - openssh-clients
+    - sshpass
   python:
     - kubernetes >= 12.0.0
   galaxy:
@@ -41,6 +41,8 @@ dependencies:
     roles: []
 
 additional_build_steps:
+  prepend_base:
+    - RUN dnf install -y python3 python3-pip python3-libdnf5
   prepend_galaxy:
     - ADD _build/configs/ansible.cfg /etc/ansible/ansible.cfg
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN

diff --git a/aws-ee/execution-environment.yml b/aws-ee/execution-environment.yml
@@ -3,7 +3,7 @@ version: 3
 
 images:
   base_image:
-    name: quay.io/fedora/fedora-minimal:latest
+    name: quay.io/fedora/fedora:latest
 
 additional_build_files:
   - dest: configs
@@ -18,7 +18,7 @@ dependencies:
   ansible_runner:
     package_pip: ansible-runner
   system:
-    - unzip [platform:rpm]
+    - unzip
   galaxy:
     collections:
       - name: amazon.aws
@@ -27,6 +27,8 @@ dependencies:
     roles: []
 
 additional_build_steps:
+  prepend_base:
+    - RUN dnf install -y python3 python3-pip python3-libdnf5
   prepend_galaxy:
     - ADD _build/configs/ansible.cfg /etc/ansible/ansible.cfg
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN

diff --git a/development-ee/execution-environment.yml b/development-ee/execution-environment.yml
@@ -3,7 +3,7 @@ version: 3
 
 images:
   base_image:
-    name: quay.io/fedora/fedora-minimal:latest
+    name: quay.io/fedora/fedora:latest
 
 additional_build_files:
   - dest: configs
@@ -18,9 +18,9 @@ dependencies:
   ansible_runner:
     package_pip: ansible-runner
   system:
-    - openssh-clients [platform:rpm]
-    - sshpass [platform:rpm]
-    - unzip [platform:rpm]
+    - openssh-clients
+    - sshpass
+    - unzip
   python:
     - kubernetes >= 12.0.0
     - ansible-lint
@@ -47,6 +47,8 @@ dependencies:
     roles: []
 
 additional_build_steps:
+  prepend_base:
+    - RUN dnf install -y python3 python3-pip python3-libdnf5
   prepend_galaxy:
     - ADD _build/configs/ansible.cfg /etc/ansible/ansible.cfg
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN

diff --git a/rosa-ee/execution-environment.yml b/rosa-ee/execution-environment.yml
@@ -3,7 +3,7 @@ version: 3
 
 images:
   base_image:
-    name: quay.io/fedora/fedora-minimal:latest
+    name: quay.io/fedora/fedora:latest
 
 additional_build_files:
   - dest: configs
@@ -18,9 +18,9 @@ dependencies:
   ansible_runner:
     package_pip: ansible-runner
   system:
-    - openssh-clients [platform:rpm]
-    - unzip [platform:rpm]
-    - tar [platform:rpm]
+    - openssh-clients
+    - unzip
+    - tar
   python:
     - kubernetes >= 12.0.0
   galaxy:
@@ -34,6 +34,8 @@ dependencies:
     roles: []
 
 additional_build_steps:
+  prepend_base:
+    - RUN dnf install -y python3 python3-pip python3-libdnf5
   prepend_galaxy:
     - ADD _build/configs/ansible.cfg /etc/ansible/ansible.cfg
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN