Skip to content

feat: parameterise hardcoded OCP version in EE build configuration #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shebistar wants to merge 1 commit into from
Closed

feat: parameterise hardcoded OCP version in EE build configuration #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-ee.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:
openshift-virtualization-migration-ee-${{ matrix.aap_version }}/context/Containerfile
platforms: linux/amd64,linux/arm64
build-args: |
OCP_VERSION=4.21
REDHAT_ORG=${{ secrets.REDHAT_ORG }}
REDHAT_ACTIVATION_KEY=${{ secrets.REDHAT_ACTIVATION_KEY }}
ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_TOKEN=${{ secrets.AH_TOKEN_VALIDATED }}
Expand Down
6 changes: 4 additions & 2 deletions openshift-virtualization-migration-ee-2.4/execution-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ additional_build_steps:
- RUN $PYCMD -m pip install --upgrade pip setuptools

prepend_builder:
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
- ARG OCP_VERSION=4.21
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"

prepend_galaxy:
- ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
Expand All @@ -41,7 +42,8 @@ additional_build_steps:
- ARG ANSIBLE_GALAXY_SERVER_LIST

prepend_final:
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
- ARG OCP_VERSION=4.21
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"

append_final:
- RUN ln -sf /usr/bin/python3.12 /usr/bin/python3
Expand Down
6 changes: 4 additions & 2 deletions openshift-virtualization-migration-ee-2.5/execution-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ additional_build_steps:
- RUN $PYCMD -m pip install --upgrade pip setuptools

prepend_builder:
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
- ARG OCP_VERSION=4.21
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"

prepend_galaxy:
- ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
Expand All @@ -41,7 +42,8 @@ additional_build_steps:
- ARG ANSIBLE_GALAXY_SERVER_LIST

prepend_final:
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
- ARG OCP_VERSION=4.21
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"

append_final:
- RUN ln -sf /usr/bin/python3.12 /usr/bin/python3
Expand Down
6 changes: 4 additions & 2 deletions openshift-virtualization-migration-ee-2.6/execution-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ additional_build_steps:
- RUN $PYCMD -m pip install --upgrade pip setuptools

prepend_builder:
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
- ARG OCP_VERSION=4.21
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"

prepend_galaxy:
- ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
Expand All @@ -41,7 +42,8 @@ additional_build_steps:
- ARG ANSIBLE_GALAXY_SERVER_LIST

prepend_final:
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
- ARG OCP_VERSION=4.21
- ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"

append_final:
- RUN ln -sf /usr/bin/python3.12 /usr/bin/python3
Expand Down
Loading