RC-3882 Merge pull request #1 from UCBoulder/cs-fork-from-sepe

RC-3882 Update to python3.9 and add additional modules, bins

.github/workflows/deploy.yml

@@ -8,14 +8,14 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Build and Deploy
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions/setup-python@v2
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Install dependencies
         run: |

.github/workflows/test-build.yml

@@ -6,14 +6,14 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Test Build
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions/setup-python@v2
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Install dependencies
         run: |
@@ -22,4 +22,4 @@ jobs:
 
       - name: Build image
         run: |
-          ansible-builder build -v3 --tag=awx-ee:test-build
+          ansible-builder build -v3 -t awx-ee:test-build --container-runtime=docker

build/requirements.txt

@@ -1 +1 @@
-ansible-builder==1.2.0
+ansible-builder==3.0.0

execution-environment.yml

@@ -1,6 +1,21 @@
 ---
-version: 1
+version: 3
+images:
+  base_image:
+    name: quay.io/centos/centos:stream9
 dependencies:
+  ansible_core:
+    # Require minimum of 2.15 to get ansible-inventory --limit option
+    package_pip: ansible-core>=2.15.0rc2,<2.16
+  ansible_runner:
+    package_pip: ansible-runner
   galaxy: spec/galaxy.yml
-  python: spec/requirements.txt
   system: spec/bindep.txt
+  python: spec/requirements.txt
+additional_build_steps:
+  append_base:
+    - RUN $PYCMD -m pip install -U pip
+  append_final:
+    - COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor
+    - RUN mkdir -p /var/run/receptor
+    - RUN git lfs install --system

spec/bindep.txt

@@ -1,2 +1,12 @@
-python38-devel [platform:rpm compile]
+python3.9-devel [platform:rpm compile]
 openldap-devel [platform:rpm compile]
+gcc [platform:rpm compile]
+git-core [platform:rpm]
+libcurl-devel [platform:rpm compile]
+subversion [platform:rpm]
+git-lfs [platform:rpm]
+sshpass [platform:rpm]
+rsync [platform:rpm]
+epel-release [platform:rpm]
+python-unversioned-command [platform:rpm]
+unzip [platform:rpm]

spec/galaxy.yml

@@ -9,3 +9,5 @@ collections:
   - name: community.hashi_vault
   - name: community.vmware
   - name: vmware.vmware_rest
+  - name: community.zabbix
+  - name: crowdstrike.falcon

spec/requirements.txt

@@ -8,3 +8,15 @@ ansible-modules-hashivault==5.1.1
 jmespath==1.0.1
 # Required by community.general LDAP plugins
 python-ldap==3.4.3
+
+# CS and RC specifics
+ansible-sign==0.1.1
+ncclient==0.6.15
+paramiko==2.12.0
+pyOpenSSL==23.3.0
+toml==0.10.2
+pexpect==4.9.0
+python-daemon==3.0.1
+pyyaml==6.0.1
+six==1.16.0
+crowdstrike-falconpy==1.3.0