From 444c9cde76bc918fbff1cd959a5b71d5d9615935 Mon Sep 17 00:00:00 2001 From: austlane Date: Fri, 26 May 2023 16:32:37 -0400 Subject: [PATCH 1/9] Update `python_interpreter` to 3.11 Upgrades AWX-EE from Python 3.9 to Python 3.11. Bringing with it 3.11's speed improvements. Also replaces `python-unversioned-command` with `alternatives` command -- as `python-unversioned-command` always links to python3.9 --- execution-environment.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/execution-environment.yml b/execution-environment.yml index 60d5ac6..e017174 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -4,6 +4,9 @@ images: base_image: name: quay.io/centos/centos:stream9 dependencies: + python_interpreter: + package_system: python3.11 + python_path: /usr/bin/python3.11 ansible_core: # Require minimum of 2.15 to get ansible-inventory --limit option package_pip: ansible-core>=2.15.0rc2,<2.16 @@ -26,7 +29,7 @@ dependencies: - name: redhatinsights.insights system: | git-core [platform:rpm] - python3.9-devel [platform:rpm compile] + python3.11-devel [platform:rpm compile] libcurl-devel [platform:rpm compile] krb5-devel [platform:rpm compile] krb5-workstation [platform:rpm] @@ -36,7 +39,6 @@ dependencies: sshpass [platform:rpm] rsync [platform:rpm] epel-release [platform:rpm] - python-unversioned-command [platform:rpm] python: | git+https://github.com/ansible/ansible-sign ncclient @@ -57,3 +59,5 @@ additional_build_steps: - COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor - RUN mkdir -p /var/run/receptor - RUN git lfs install --system + # SymLink `python` -> `python3.11` + - RUN alternatives --install /usr/bin/python python /usr/bin/python3.11 311 From 7da7be3140c9094dd6dbc83b51112bf4dd6da889 Mon Sep 17 00:00:00 2001 From: Zack Kayyali Date: Tue, 28 Nov 2023 12:36:13 -0500 Subject: [PATCH 2/9] Add Dependancy 'podman-remote' Necessary for containerized receptor functionality --- execution-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/execution-environment.yml b/execution-environment.yml index ac1431c..ca6b5f9 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -38,6 +38,7 @@ dependencies: epel-release [platform:rpm] python-unversioned-command [platform:rpm] unzip [platform:rpm] + podman-remote [platform:rpm] python: | git+https://github.com/ansible/ansible-sign ncclient From 7c6f8a1520507858d3db363cb213c2fd11914927 Mon Sep 17 00:00:00 2001 From: Zack Kayyali Date: Mon, 11 Dec 2023 15:37:12 -0500 Subject: [PATCH 3/9] Also add receptorctl --- execution-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/execution-environment.yml b/execution-environment.yml index ca6b5f9..823b2ee 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -52,6 +52,7 @@ dependencies: python-daemon pyyaml six + receptorctl additional_build_steps: append_base: - RUN $PYCMD -m pip install -U pip From 0b2676fa4bde7dfbfda418a408011925c33edb33 Mon Sep 17 00:00:00 2001 From: Zack Kayyali Date: Mon, 11 Dec 2023 15:46:07 -0500 Subject: [PATCH 4/9] Pip install podman-remote, instead of rpm --- execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution-environment.yml b/execution-environment.yml index 823b2ee..4ec70ca 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -38,7 +38,6 @@ dependencies: epel-release [platform:rpm] python-unversioned-command [platform:rpm] unzip [platform:rpm] - podman-remote [platform:rpm] python: | git+https://github.com/ansible/ansible-sign ncclient @@ -53,6 +52,7 @@ dependencies: pyyaml six receptorctl + podman-remote additional_build_steps: append_base: - RUN $PYCMD -m pip install -U pip From 4d7f1e20c0603dd1281236578f7d925913d1ed34 Mon Sep 17 00:00:00 2001 From: Zack Kayyali Date: Mon, 11 Dec 2023 15:53:29 -0500 Subject: [PATCH 5/9] Switch back to rpm --- execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution-environment.yml b/execution-environment.yml index 4ec70ca..823b2ee 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -38,6 +38,7 @@ dependencies: epel-release [platform:rpm] python-unversioned-command [platform:rpm] unzip [platform:rpm] + podman-remote [platform:rpm] python: | git+https://github.com/ansible/ansible-sign ncclient @@ -52,7 +53,6 @@ dependencies: pyyaml six receptorctl - podman-remote additional_build_steps: append_base: - RUN $PYCMD -m pip install -U pip From 5166ba13cb45eba3a461f14807b569c0c757f268 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 8 Jan 2024 15:19:48 +0300 Subject: [PATCH 6/9] Ensure azcollection 2.1.0 or up Related: ansible/awx#14628 --- execution-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/execution-environment.yml b/execution-environment.yml index 823b2ee..fdbb6c1 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -14,6 +14,7 @@ dependencies: collections: - name: awx.awx - name: azure.azcollection + version: ">=2.1.0" - name: amazon.aws - name: theforeman.foreman - name: google.cloud From 3fb40ae0d5d231de069dd9fc60cc2c85f524ebfd Mon Sep 17 00:00:00 2001 From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> Date: Mon, 26 Feb 2024 17:25:00 -0500 Subject: [PATCH 7/9] Able to publish on fork For testing build/publish workflow --- .github/workflows/build-latest.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index f55cc04..83f049a 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -25,13 +25,16 @@ jobs: python -m pip install --upgrade pip pip install tox + - name: Quay login + run: | + echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin + - name: Build image env: DOCKER_BUILDKIT: 1 run: | - tox -e docker -- --tag=quay.io/ansible/awx-ee:latest + tox -e docker -- --tag=${{ vars.IMAGE_REGISTRY }}/awx-ee:latest - name: Push images run: | - echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin - docker push quay.io/ansible/awx-ee:latest + docker push ${{ vars.IMAGE_REGISTRY }}/awx-ee:latest From 0645db227b2eb2c115a746df7166e789d5ca502d Mon Sep 17 00:00:00 2001 From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> Date: Mon, 26 Feb 2024 17:38:04 -0500 Subject: [PATCH 8/9] Build and push amd64 and arm64 image --- .github/workflows/build-latest.yml | 19 ++++++++++--------- execution-environment.yml | 5 +++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 83f049a..ce7fa25 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -23,18 +23,19 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox + pip install -r requirements.txt - name: Quay login run: | echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin - - name: Build image - env: - DOCKER_BUILDKIT: 1 + - name: Build and push image run: | - tox -e docker -- --tag=${{ vars.IMAGE_REGISTRY }}/awx-ee:latest - - - name: Push images - run: | - docker push ${{ vars.IMAGE_REGISTRY }}/awx-ee:latest + docker buildx create --name awx-ee-buildx + docker buildx use awx-ee-buildx + ansible-builder create -v3 --output-file=Dockerfile + docker buildx build \ + --push \ + --platform=linux/amd64,linux/arm64 \ + --tag=${{ vars.IMAGE_REGISTRY }}/awx-ee:latest \ + context diff --git a/execution-environment.yml b/execution-environment.yml index 823b2ee..97dc953 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -39,6 +39,11 @@ dependencies: python-unversioned-command [platform:rpm] unzip [platform:rpm] podman-remote [platform:rpm] + cmake [platform:rpm compile] + gcc [platform:rpm compile] + gcc-c++ [platform:rpm compile] + make [platform:rpm compile] + openssl-devel [platform:rpm compile] python: | git+https://github.com/ansible/ansible-sign ncclient From 00fe06c671fb522da3278c1d9c2e46e55d3b84f8 Mon Sep 17 00:00:00 2001 From: Chad Ferman Date: Fri, 5 Apr 2024 11:35:38 -0500 Subject: [PATCH 9/9] Update execution-environment.yml to add kubevirt.core In order to have openshift virtualization as a inventory source we need the kubevirt.core collection added to this collection --- execution-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/execution-environment.yml b/execution-environment.yml index d078a92..c0fdd5f 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -25,6 +25,7 @@ dependencies: - name: ansible.posix - name: ansible.windows - name: redhatinsights.insights + - name: kubevirt.core system: | git-core [platform:rpm] python3.9-devel [platform:rpm compile]