Skip to content

Commit

Permalink
Remove 2.12 and add 2.16
Browse files Browse the repository at this point in the history
  • Loading branch information
lumarel committed Jan 13, 2024
1 parent dacba6d commit 96da90e
Show file tree
Hide file tree
Showing 34 changed files with 206 additions and 51 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
strategy:
matrix:
version:
- "2.12"
- "2.14"
- "2.15"
- "2.16"
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -113,6 +113,7 @@ jobs:
version:
- "2.14"
- "2.15"
- "2.16"
type:
- cloud
- infra
Expand Down Expand Up @@ -175,9 +176,9 @@ jobs:
strategy:
matrix:
version:
- "2.12"
- "2.14"
- "2.15"
- "2.16"
steps:
- uses: actions/checkout@v3

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ jobs:
strategy:
matrix:
version:
- "2.12"
- "2.14"
- "2.15"
- "2.16"
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -114,6 +114,7 @@ jobs:
version:
- "2.14"
- "2.15"
- "2.16"
type:
- cloud
- infra
Expand Down Expand Up @@ -166,9 +167,9 @@ jobs:
strategy:
matrix:
version:
- "2.12"
- "2.14"
- "2.15"
- "2.16"
steps:
- uses: actions/checkout@v3

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
strategy:
matrix:
version:
- "2.12"
- "2.14"
- "2.15"
- "2.16"
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -109,6 +109,7 @@ jobs:
version:
- "2.14"
- "2.15"
- "2.16"
type:
- cloud
- infra
Expand Down Expand Up @@ -171,9 +172,9 @@ jobs:
strategy:
matrix:
version:
- "2.12"
- "2.14"
- "2.15"
- "2.16"
steps:
- uses: actions/checkout@v3

Expand Down
13 changes: 13 additions & 0 deletions build/bindep-3.11.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
epel-release [platform:rpm]
git-core [platform:rpm]
git-lfs [platform:rpm]
krb5-devel [platform:rpm compile]
krb5-workstation [platform:rpm]
libcurl-devel [platform:rpm compile]
python-unversioned-command [platform:rpm]
python3.11-devel [platform:rpm compile]
rsync [platform:rpm]
sshpass [platform:rpm]
subversion [platform:rpm]
subversion [platform:dpkg]
unzip [platform:rpm]
2 changes: 1 addition & 1 deletion build/bindep.txt → build/bindep-3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ krb5-devel [platform:rpm compile]
krb5-workstation [platform:rpm]
libcurl-devel [platform:rpm compile]
python-unversioned-command [platform:rpm]
python3-devel [platform:rpm compile]
python3.9-devel [platform:rpm compile]
rsync [platform:rpm]
sshpass [platform:rpm]
subversion [platform:rpm]
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.14-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-cloud.yml
python: build/requirements.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.14-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-infra.yml
python: build/requirements-infra.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.14-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-lint.yml
python: build/requirements-lint.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.14-network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-network.yml
python: build/requirements.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.14-storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-storage.yml
python: build/requirements-storage.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.14-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-sync.yml
python: build/requirements-sync.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements.yml
python: build/requirements.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.15-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-cloud.yml
python: build/requirements.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.15-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-infra.yml
python: build/requirements-infra.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.15-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-lint.yml
python: build/requirements-lint.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.15-network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-network.yml
python: build/requirements.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.15-storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-storage.yml
python: build/requirements-storage.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.15-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements-sync.yml
python: build/requirements-sync.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
2 changes: 1 addition & 1 deletion execution-environment-2.15.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
package_pip: ansible-runner
galaxy: build/requirements.yml
python: build/requirements.txt
system: build/bindep.txt
system: build/bindep-3.9.txt
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
29 changes: 29 additions & 0 deletions execution-environment-2.16-cloud.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
version: 3
images:
base_image:
name: quay.io/rockylinux/rockylinux:9
dependencies:
ansible_core:
package_pip: ansible-core==2.16.*
ansible_runner:
package_pip: ansible-runner
galaxy: build/requirements-cloud.yml
python: build/requirements.txt
system: build/bindep-3.11.txt
python_interpreter:
package_system: "python3.11"
python_path: "/usr/bin/python3.11"
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
prepend_builder:
- RUN dnf install -y epel-release
prepend_final:
- RUN dnf install -y epel-release
append_final:
- COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor
- RUN mkdir -p /var/run/receptor
- ADD certs /etc/pki/ca-trust/source/anchors
- RUN update-ca-trust
- RUN git lfs install --system
29 changes: 29 additions & 0 deletions execution-environment-2.16-infra.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
version: 3
images:
base_image:
name: quay.io/rockylinux/rockylinux:9
dependencies:
ansible_core:
package_pip: ansible-core==2.16.*
ansible_runner:
package_pip: ansible-runner
galaxy: build/requirements-infra.yml
python: build/requirements-infra.txt
system: build/bindep-3.11.txt
python_interpreter:
package_system: "python3.11"
python_path: "/usr/bin/python3.11"
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
prepend_builder:
- RUN dnf install -y epel-release
prepend_final:
- RUN dnf install -y epel-release
append_final:
- COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor
- RUN mkdir -p /var/run/receptor
- ADD certs /etc/pki/ca-trust/source/anchors
- RUN update-ca-trust
- RUN git lfs install --system
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ options:
user: root
dependencies:
ansible_core:
package_pip: ansible-core==2.12.*
package_pip: ansible-core==2.16.*
ansible_runner:
package_pip: ansible-runner
galaxy: build/requirements-lint.yml
python: build/requirements-lint.txt
system: build/bindep.txt
system: build/bindep-3.11.txt
python_interpreter:
package_system: "python3.11"
python_path: "/usr/bin/python3.11"
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
Expand Down
29 changes: 29 additions & 0 deletions execution-environment-2.16-network.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
version: 3
images:
base_image:
name: quay.io/rockylinux/rockylinux:9
dependencies:
ansible_core:
package_pip: ansible-core==2.16.*
ansible_runner:
package_pip: ansible-runner
galaxy: build/requirements-network.yml
python: build/requirements.txt
system: build/bindep-3.11.txt
python_interpreter:
package_system: "python3.11"
python_path: "/usr/bin/python3.11"
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
prepend_builder:
- RUN dnf install -y epel-release
prepend_final:
- RUN dnf install -y epel-release
append_final:
- COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor
- RUN mkdir -p /var/run/receptor
- ADD certs /etc/pki/ca-trust/source/anchors
- RUN update-ca-trust
- RUN git lfs install --system
29 changes: 29 additions & 0 deletions execution-environment-2.16-storage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
version: 3
images:
base_image:
name: quay.io/rockylinux/rockylinux:9
dependencies:
ansible_core:
package_pip: ansible-core==2.16.*
ansible_runner:
package_pip: ansible-runner
galaxy: build/requirements-storage.yml
python: build/requirements-storage.txt
system: build/bindep-3.11.txt
python_interpreter:
package_system: "python3.11"
python_path: "/usr/bin/python3.11"
additional_build_steps:
append_base:
- RUN $PYCMD -m pip install -U pip
prepend_builder:
- RUN dnf install -y epel-release
prepend_final:
- RUN dnf install -y epel-release
append_final:
- COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor
- RUN mkdir -p /var/run/receptor
- ADD certs /etc/pki/ca-trust/source/anchors
- RUN update-ca-trust
- RUN git lfs install --system
Loading

0 comments on commit 96da90e

Please sign in to comment.