Skip to content

Commit

Permalink
Fix Supported Operating Systems Matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
electrocucaracha committed Jan 22, 2025
1 parent be78a9f commit 3eb6770
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 59 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,22 @@ jobs:
strategy:
max-parallel: 1
fail-fast: false
# NOTE: https://docs.openstack.org/kolla-ansible/latest/user/support-matrix
matrix:
image:
[
"docker.io/library/debian:11",
"docker.io/library/debian:12",
"docker.io/library/ubuntu:22.04",
"docker.io/library/rockylinux:9",
]
os_release: ["2023.1", "2023.2", "2024.1", "2024.2"]
include:
- image: "docker.io/library/debian:11"
os_release: "2023.1"
- image: "docker.io/library/debian:11"
os_release: "2023.2"
- image: "docker.io/library/debian:11"
os_release: "2024.1"
container:
image: ${{ matrix.image }}
runs-on: ubuntu-latest
Expand All @@ -44,17 +52,22 @@ jobs:
ubuntu|debian)
apt update
INSTALLER_CMD="apt-get -y --no-install-recommends -q=3 install"
$INSTALLER_CMD python3-pip git python3-venv
;;
rhel|centos|fedora|rocky)
INSTALLER_CMD="$(command -v dnf || command -v yum) -y --quiet --errorlevel=0 install"
$INSTALLER_CMD python3.11-pip git python3.11
rm -f /usr/bin/python3
ln -s /usr/bin/python3.11 /usr/bin/python3
;;
esac
$INSTALLER_CMD python3-pip git
python3 -m venv .venv
source .venv/bin/activate
pip3 install pip-tools
- uses: technote-space/create-pr-action@91114507cf92349bec0a9a501c2edf1635427bc5 # 2.1.4
with:
EXECUTE_COMMANDS: |
bash -c 'source /etc/os-release; pip-compile --output-file="requirements/${{ matrix.os_release }}/${ID,,}_${VERSION_ID%.*}.txt" "requirements/${{ matrix.os_release }}/${ID,,}_${VERSION_ID%.*}.in" --upgrade'
bash -c 'source .venv/bin/activate; source /etc/os-release; pip-compile --output-file="requirements/${{ matrix.os_release }}/${ID,,}_${VERSION_ID%.*}.txt" "requirements/${{ matrix.os_release }}/${ID,,}_${VERSION_ID%.*}.in" --upgrade'
COMMIT_MESSAGE: "Upgrade OpenStack Kolla dependencies"
COMMIT_NAME: "electrocucaracha bot"
PR_BRANCH_NAME: "versions-update-${PR_ID}"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements/2024.1/debian_11.txt requirements/2024.1/debian_11.in
# pip-compile --output-file=requirements/2024.2/debian_12.txt requirements/2024.2/debian_12.in
#
ansible-core==2.15.12
# via -r requirements/2024.1/debian_11.in
bcrypt==4.2.0
ansible-core==2.17.7
# via
# -r requirements/2024.2/debian_12.in
# kolla-ansible
autopage==0.5.2
# via cliff
bcrypt==4.2.1
# via
# kolla-ansible
# passlib
certifi==2024.8.30
certifi==2024.12.14
# via requests
cffi==1.17.1
# via cryptography
charset-normalizer==3.3.2
charset-normalizer==3.4.1
# via requests
cryptography==43.0.1
cliff==4.8.0
# via kolla-ansible
cmd2==2.5.9
# via cliff
cryptography==44.0.0
# via
# ansible-core
# kolla-ansible
Expand All @@ -28,53 +36,54 @@ hvac==2.3.0
# via kolla-ansible
idna==3.10
# via requests
importlib-resources==5.0.7
# via ansible-core
iso8601==2.1.0
# via oslo-utils
jinja2==3.1.4
jinja2==3.1.5
# via
# ansible-core
# kolla-ansible
jmespath==1.0.1
# via kolla-ansible
kolla-ansible==18.2.0
# via -r requirements/2024.1/debian_11.in
markupsafe==2.1.5
kolla-ansible==19.2.0
# via -r requirements/2024.2/debian_12.in
markupsafe==3.0.2
# via jinja2
netaddr==1.3.0
# via
# oslo-config
# oslo-utils
netifaces==0.11.0
# via oslo-utils
oslo-config==9.6.0
oslo-config==9.7.0
# via kolla-ansible
oslo-i18n==6.4.0
oslo-i18n==6.5.0
# via
# oslo-config
# oslo-utils
oslo-utils==7.3.0
oslo-utils==8.0.0
# via kolla-ansible
packaging==24.1
packaging==24.2
# via
# ansible-core
# oslo-utils
passlib[bcrypt]==1.7.4
# via kolla-ansible
pbr==6.1.0
# via
# kolla-ansible
# oslo-i18n
# stevedore
prettytable==3.12.0
# via cliff
psutil==6.1.1
# via oslo-utils
pycparser==2.22
# via cffi
pyparsing==3.1.4
pyparsing==3.2.1
# via oslo-utils
pyperclip==1.9.0
# via cmd2
pyyaml==6.0.2
# via
# ansible-core
# kolla-ansible
# cliff
# oslo-config
# oslo-utils
requests==2.32.3
Expand All @@ -85,11 +94,17 @@ resolvelib==1.0.1
# via ansible-core
rfc3986==2.0.0
# via oslo-config
stevedore==5.3.0
# via oslo-config
tzdata==2024.2
stevedore==5.4.0
# via
# cliff
# oslo-config
tzdata==2025.1
# via oslo-utils
urllib3==2.2.3
urllib3==2.3.0
# via requests
wrapt==1.16.0
wcwidth==0.2.13
# via
# cmd2
# prettytable
wrapt==1.17.2
# via debtcollector
71 changes: 43 additions & 28 deletions requirements/2024.2/rocky_9.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements/2024.1/rocky_9.txt requirements/2024.1/rocky_9.in
# pip-compile --output-file=requirements/2024.2/rocky_9.txt requirements/2024.2/rocky_9.in
#
ansible-core==2.15.12
# via -r requirements/2024.1/rocky_9.in
bcrypt==4.2.0
ansible-core==2.17.7
# via
# -r requirements/2024.2/rocky_9.in
# kolla-ansible
autopage==0.5.2
# via cliff
bcrypt==4.2.1
# via
# kolla-ansible
# passlib
certifi==2024.8.30
certifi==2024.12.14
# via requests
cffi==1.17.1
# via cryptography
charset-normalizer==3.3.2
charset-normalizer==3.4.1
# via requests
cryptography==43.0.1
cliff==4.8.0
# via kolla-ansible
cmd2==2.5.9
# via cliff
cryptography==44.0.0
# via
# ansible-core
# kolla-ansible
Expand All @@ -28,53 +36,54 @@ hvac==2.3.0
# via kolla-ansible
idna==3.10
# via requests
importlib-resources==5.0.7
# via ansible-core
iso8601==2.1.0
# via oslo-utils
jinja2==3.1.4
jinja2==3.1.5
# via
# ansible-core
# kolla-ansible
jmespath==1.0.1
# via kolla-ansible
kolla-ansible==18.2.0
# via -r requirements/2024.1/rocky_9.in
markupsafe==2.1.5
kolla-ansible==19.2.0
# via -r requirements/2024.2/rocky_9.in
markupsafe==3.0.2
# via jinja2
netaddr==1.3.0
# via
# oslo-config
# oslo-utils
netifaces==0.11.0
# via oslo-utils
oslo-config==9.6.0
oslo-config==9.7.0
# via kolla-ansible
oslo-i18n==6.4.0
oslo-i18n==6.5.0
# via
# oslo-config
# oslo-utils
oslo-utils==7.3.0
oslo-utils==8.0.0
# via kolla-ansible
packaging==24.1
packaging==24.2
# via
# ansible-core
# oslo-utils
passlib[bcrypt]==1.7.4
# via kolla-ansible
pbr==6.1.0
# via
# kolla-ansible
# oslo-i18n
# stevedore
prettytable==3.12.0
# via cliff
psutil==6.1.1
# via oslo-utils
pycparser==2.22
# via cffi
pyparsing==3.1.4
pyparsing==3.2.1
# via oslo-utils
pyperclip==1.9.0
# via cmd2
pyyaml==6.0.2
# via
# ansible-core
# kolla-ansible
# cliff
# oslo-config
# oslo-utils
requests==2.32.3
Expand All @@ -85,11 +94,17 @@ resolvelib==1.0.1
# via ansible-core
rfc3986==2.0.0
# via oslo-config
stevedore==5.3.0
# via oslo-config
tzdata==2024.2
stevedore==5.4.0
# via
# cliff
# oslo-config
tzdata==2025.1
# via oslo-utils
urllib3==2.2.3
urllib3==2.3.0
# via requests
wrapt==1.16.0
wcwidth==0.2.13
# via
# cmd2
# prettytable
wrapt==1.17.2
# via debtcollector

0 comments on commit 3eb6770

Please sign in to comment.