Skip to content

Commit

Permalink
added 2.5 EE to build script (#195)
Browse files Browse the repository at this point in the history
  • Loading branch information
jce-redhat authored Oct 28, 2024
1 parent 1e266f4 commit fbb6d95
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 2 deletions.
4 changes: 3 additions & 1 deletion execution_environments/apd-ee-25.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ images:
name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel9:latest

dependencies:
galaxy: requirements.yml
galaxy: requirements-25.yml
python_interpreter:
python_path: /usr/bin/python3.11

additional_build_files:
# https://access.redhat.com/solutions/7024259
Expand Down
3 changes: 3 additions & 0 deletions execution_environments/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
# array of images to build
ee_images=(
"apd-ee-24"
"apd-ee-25"
)

for ee in "${ee_images[@]}"
do
echo "Building EE image ${ee}"

# build EE image
ansible-builder build \
--file ${ee}.yml \
Expand Down
63 changes: 63 additions & 0 deletions execution_environments/requirements-25.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
collections:
# AAP config as code
- name: ansible.controller
version: ">=4.6.0"
# TODO this fails trying to install a different version of
# the python-systemd package
# - name: ansible.eda # fails trying to install systemd-python package
# version: ">=2.1.0"
- name: ansible.hub
version: ">=1.0.0"
- name: ansible.platform
version: ">=2.5.0"
- name: infra.ah_configuration
version: ">=2.0.6"
- name: infra.controller_configuration
version: ">=2.11.0"
# linux demos
- name: ansible.posix
version: ">=1.5.4"
- name: community.general
version: ">=8.0.0"
- name: containers.podman
version: ">=1.12.1"
- name: redhat.insights
version: ">=1.2.2"
- name: redhat.rhel_system_roles
version: ">=1.23.0"
# windows demos
- name: ansible.windows
version: ">=2.3.0"
- name: chocolatey.chocolatey
version: ">=1.5.1"
- name: community.windows
version: ">=2.2.0"
# cloud demos
- name: amazon.aws
version: ">=7.5.0"
# satellite demos
- name: redhat.satellite
version: ">=4.0.0"
# network demos
- name: ansible.netcommon
version: ">=6.0.0"
- name: cisco.ios
version: ">=7.0.0"
- name: cisco.iosxr
version: ">=8.0.0"
- name: cisco.nxos
version: ">=7.0.0"
# TODO on 2.5 ee-minimal-rhel9 this tries to build and install
# a different version of python netifaces, which fails
# - name: infoblox.nios_modules
# version: ">=1.6.1"
# openshift demos
- name: kubernetes.core
version: ">=4.0.0"
- name: redhat.openshift
version: ">=3.0.1"
- name: redhat.openshift_virtualization
version: ">=1.4.0"

...
2 changes: 1 addition & 1 deletion execution_environments/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
collections:
- name: ansible.controller
version: ">=4.5.5"
version: "<4.6.0"
- name: infra.ah_configuration
version: ">=2.0.6"
- name: infra.controller_configuration
Expand Down

0 comments on commit fbb6d95

Please sign in to comment.