Skip to content

Commit

Permalink
Merge pull request #46 from UCBoulder/devel
Browse files Browse the repository at this point in the history
RC-4053 Resolve failing builds to due version conflicts
  • Loading branch information
willhaines authored Apr 18, 2024
2 parents 7e19885 + aff542a commit 236974d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SEPE AWX EE

A Custom Ansible Execution Environment for Platform Engineering using
python 3.9.
python 3.9.18.

Originally cloned from the [Ansible awx-ee repository](https://github.com/ansible/awx-ee).

Expand All @@ -19,16 +19,16 @@ This should result in a podman image, for example:
```
$ podman images
REPOSITORY TAG IMAGE ID CREATED SIZE
localhost/awx-ee local f6c5989cd851 3 hours ago 1.99 GB
localhost/awx-ee local 3aaeab7a4777 2 hours ago 2.1 GB
```

To run the local execution environment image above in a container with a
bash prompt:

```
$ podman run -it f6c5989cd851 /bin/bash
$ podman run -it 3aaeab7a4777 /bin/bash
bash-5.1# python3 -V
Python 3.9.19
Python 3.9.18
bash-5.1# exit
```

Expand Down
1 change: 1 addition & 0 deletions spec/bindep.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ rsync [platform:rpm]
epel-release [platform:rpm]
python-unversioned-command [platform:rpm]
unzip [platform:rpm]
podman-remote [platform:rpm]
1 change: 1 addition & 0 deletions spec/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
collections:
- name: awx.awx
- name: azure.azcollection
version: ">=2.1.0"
- name: kubernetes.core
- name: ansible.posix
- name: ansible.windows
Expand Down
21 changes: 8 additions & 13 deletions spec/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
# SEPE-specific, copied from GREQ0302203
ansible==6.7.0
# wazh7587 03/06/2024 commenting to test bump from 6.7.0 to 8.7.0, the max version for python 3.9.18
# ansible==6.7.0
ansible==8.7.0
# Workaround to address pyOpenSSL version issues with ansible-runner (see https://github.com/ansible/ansible-runner/issues/1138)
ansible-runner>=2.2.1
# wazh7587 03/062024 commenting as this appears to have been fixed upstream, test bump from 2.2.1 to 2.3.6
# ansible-runner>=2.2.1
ansible-runner==2.3.6
# Upstream hasn't packaged as collection yet: https://github.com/TerryHowe/ansible-modules-hashivault/issues/234
ansible-modules-hashivault==5.2.1
# Required a number of places including community.general
jmespath==1.0.1
# Required by community.general LDAP plugins
python-ldap==3.4.4

# CUCS and CURC-specific
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
# wazh7587 03/27/2024 Added from awx-ee for containerized receptor mesh support
receptorctl==1.4.5

0 comments on commit 236974d

Please sign in to comment.