From 43ed26a73252ac7802a6cd8e5d7415146b8019e3 Mon Sep 17 00:00:00 2001 From: Lukas Magauer <42647570+lumarel@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:24:25 +0000 Subject: [PATCH] Add Infra Type --- .github/workflows/build-latest.yml | 2 ++ .github/workflows/ci.yml | 2 ++ .github/workflows/release.yml | 2 ++ build/requirements-infra.txt | 20 ++++++++++++++++++++ build/requirements-infra.yml | 11 +++++++++++ execution-environment-2.14-infra.yml | 28 ++++++++++++++++++++++++++++ execution-environment-2.15-infra.yml | 26 ++++++++++++++++++++++++++ execution-environment-infra.yml | 28 ++++++++++++++++++++++++++++ 8 files changed, 119 insertions(+) create mode 100644 build/requirements-infra.txt create mode 100644 build/requirements-infra.yml create mode 100644 execution-environment-2.14-infra.yml create mode 100644 execution-environment-2.15-infra.yml create mode 100644 execution-environment-infra.yml diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 3de1fd1..4d9c8e8 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -76,6 +76,7 @@ jobs: matrix: type: - cloud + - infra - network - storage - sync @@ -113,6 +114,7 @@ jobs: - "2.15" type: - cloud + - infra - network - storage - sync diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 049ce2c..49e5da0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,6 +82,7 @@ jobs: matrix: type: - cloud + - infra - network - storage - sync @@ -114,6 +115,7 @@ jobs: - "2.15" type: - cloud + - infra - network - storage - sync diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9881d46..18a6876 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,6 +72,7 @@ jobs: matrix: type: - cloud + - infra - network - storage - sync @@ -109,6 +110,7 @@ jobs: - "2.15" type: - cloud + - infra - network - storage - sync diff --git a/build/requirements-infra.txt b/build/requirements-infra.txt new file mode 100644 index 0000000..d9e4210 --- /dev/null +++ b/build/requirements-infra.txt @@ -0,0 +1,20 @@ +git+https://github.com/ansible/ansible-sign + +ncclient +paramiko +pykerberos +pyOpenSSL>22.1.0 +pypsrp[kerberos,credssp] +pywinrm[kerberos,credssp] +toml +pexpect>=4.5 +python-daemon +pyyaml +requests-credssp +six + +dnspython +netaddr +netapp-lib +psutil +pycdlib diff --git a/build/requirements-infra.yml b/build/requirements-infra.yml new file mode 100644 index 0000000..33e6eb3 --- /dev/null +++ b/build/requirements-infra.yml @@ -0,0 +1,11 @@ +--- +collections: + - name: ansible.netcommon + - name: ansible.posix + - name: ansible.utils + - name: ansible.windows + - name: community.crypto + - name: community.general + - name: community.vmware + - name: netapp.ontap + - name: vmware.vmware_rest diff --git a/execution-environment-2.14-infra.yml b/execution-environment-2.14-infra.yml new file mode 100644 index 0000000..d9bb6a3 --- /dev/null +++ b/execution-environment-2.14-infra.yml @@ -0,0 +1,28 @@ +--- +version: 3 +images: + base_image: + name: quay.io/rockylinux/rockylinux:9 +dependencies: + ansible_core: + package_pip: ansible-core==2.14.* + ansible_runner: + package_pip: ansible-runner + galaxy: build/requirements-infra.yml + python: build/requirements-infra.txt + system: build/bindep.txt +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 https://raw.githubusercontent.com/ansible/ansible/ff3ee9c4bdac68909bcb769091a198a7c45e6350/lib/ansible/cli/inventory.py /usr/local/lib/python3.9/site-packages/ansible/cli/inventory.py + - RUN chmod 0644 /usr/local/lib/python3.9/site-packages/ansible/cli/inventory.py + - ADD certs /etc/pki/ca-trust/source/anchors + - RUN update-ca-trust + - RUN git lfs install --system diff --git a/execution-environment-2.15-infra.yml b/execution-environment-2.15-infra.yml new file mode 100644 index 0000000..7ff4ca7 --- /dev/null +++ b/execution-environment-2.15-infra.yml @@ -0,0 +1,26 @@ +--- +version: 3 +images: + base_image: + name: quay.io/rockylinux/rockylinux:9 +dependencies: + ansible_core: + package_pip: ansible-core==2.15.* + ansible_runner: + package_pip: ansible-runner + galaxy: build/requirements-infra.yml + python: build/requirements-infra.txt + system: build/bindep.txt +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 diff --git a/execution-environment-infra.yml b/execution-environment-infra.yml new file mode 100644 index 0000000..01db3ca --- /dev/null +++ b/execution-environment-infra.yml @@ -0,0 +1,28 @@ +--- +version: 3 +images: + base_image: + name: quay.io/rockylinux/rockylinux:9 +dependencies: + ansible_core: + package_pip: ansible-core<2.15 + ansible_runner: + package_pip: ansible-runner + galaxy: build/requirements-infra.yml + python: build/requirements-infra.txt + system: build/bindep.txt +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 https://raw.githubusercontent.com/ansible/ansible/ff3ee9c4bdac68909bcb769091a198a7c45e6350/lib/ansible/cli/inventory.py /usr/local/lib/python3.9/site-packages/ansible/cli/inventory.py + - RUN chmod 0644 /usr/local/lib/python3.9/site-packages/ansible/cli/inventory.py + - ADD certs /etc/pki/ca-trust/source/anchors + - RUN update-ca-trust + - RUN git lfs install --system