Skip to content

Commit 0ab83ac

Browse files
electrocucarachaelectrocucaracha
committed
Fix Supported Operating Systems Matrix
1 parent be78a9f commit 0ab83ac

File tree

10 files changed

+386
-57
lines changed

10 files changed

+386
-57
lines changed

‎.github/workflows/update.yml‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,22 @@ jobs:
2323
strategy:
2424
max-parallel: 1
2525
fail-fast: false
26+
# NOTE: https://docs.openstack.org/kolla-ansible/latest/user/support-matrix
2627
matrix:
2728
image:
2829
[
29-
"docker.io/library/debian:11",
30+
"docker.io/library/debian:12",
3031
"docker.io/library/ubuntu:22.04",
3132
"docker.io/library/rockylinux:9",
3233
]
3334
os_release: ["2023.1", "2023.2", "2024.1", "2024.2"]
35+
include:
36+
- image: "docker.io/library/debian:11"
37+
os_release: "2023.1"
38+
- image: "docker.io/library/debian:11"
39+
os_release: "2023.2"
40+
- image: "docker.io/library/debian:11"
41+
os_release: "2024.1"
3442
container:
3543
image: ${{ matrix.image }}
3644
runs-on: ubuntu-latest
@@ -44,17 +52,26 @@ jobs:
4452
ubuntu|debian)
4553
apt update
4654
INSTALLER_CMD="apt-get -y --no-install-recommends -q=3 install"
55+
if [[ $VERSION_ID == "11" ]]; then
56+
$INSTALLER_CMD python3-pip python3-venv git
57+
python3 -m pip install pipx
58+
else
59+
$INSTALLER_CMD pipx git
60+
fi
4761
;;
4862
rhel|centos|fedora|rocky)
4963
INSTALLER_CMD="$(command -v dnf || command -v yum) -y --quiet --errorlevel=0 install"
64+
$INSTALLER_CMD python3.12 git python3.12-pip
65+
rm -f /usr/bin/python3
66+
ln -s /usr/bin/python3.12 /usr/bin/python3
67+
python3 -m pip install pipx
5068
;;
5169
esac
52-
$INSTALLER_CMD python3-pip git
53-
pip3 install pip-tools
70+
pipx install pip-tools
5471
- uses: technote-space/create-pr-action@91114507cf92349bec0a9a501c2edf1635427bc5 # 2.1.4
5572
with:
5673
EXECUTE_COMMANDS: |
57-
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'
74+
bash -c 'source /etc/os-release; ~/.local/bin/pip-compile --output-file="requirements/${{ matrix.os_release }}/${ID,,}_${VERSION_ID%.*}.txt" "requirements/${{ matrix.os_release }}/${ID,,}_${VERSION_ID%.*}.in" --upgrade'
5875
COMMIT_MESSAGE: "Upgrade OpenStack Kolla dependencies"
5976
COMMIT_NAME: "electrocucaracha bot"
6077
PR_BRANCH_NAME: "versions-update-${PR_ID}"

requirements/2024.2/debian_11.in renamed to requirements/2023.1/debian_12.in

File renamed without changes.

‎requirements/2023.1/debian_12.txt‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
4+
#
5+
# pip-compile --output-file=requirements/2023.1/debian_12.txt requirements/2023.1/debian_12.in
6+
#
7+
ansible==6.0.0
8+
# via -r requirements/2023.1/debian_12.in
9+
ansible-core==2.13.0
10+
# via
11+
# -r requirements/2023.1/debian_12.in
12+
# ansible
13+
certifi==2024.12.14
14+
# via requests
15+
cffi==1.17.1
16+
# via cryptography
17+
charset-normalizer==3.4.1
18+
# via requests
19+
cryptography==44.0.0
20+
# via
21+
# ansible-core
22+
# kolla-ansible
23+
debtcollector==3.0.0
24+
# via
25+
# oslo-config
26+
# oslo-utils
27+
hvac==2.3.0
28+
# via kolla-ansible
29+
idna==3.10
30+
# via requests
31+
iso8601==2.1.0
32+
# via oslo-utils
33+
jinja2==3.1.5
34+
# via
35+
# ansible-core
36+
# kolla-ansible
37+
jmespath==1.0.1
38+
# via kolla-ansible
39+
kolla-ansible==16.7.0
40+
# via -r requirements/2023.1/debian_12.in
41+
markupsafe==3.0.2
42+
# via jinja2
43+
mitogen==0.3.21
44+
# via -r requirements/2023.1/debian_12.in
45+
netaddr==1.3.0
46+
# via
47+
# oslo-config
48+
# oslo-utils
49+
oslo-config==9.7.0
50+
# via kolla-ansible
51+
oslo-i18n==6.5.0
52+
# via
53+
# oslo-config
54+
# oslo-utils
55+
oslo-utils==8.0.0
56+
# via kolla-ansible
57+
packaging==24.2
58+
# via
59+
# ansible-core
60+
# oslo-utils
61+
pbr==6.1.0
62+
# via
63+
# kolla-ansible
64+
# oslo-i18n
65+
# stevedore
66+
psutil==6.1.1
67+
# via oslo-utils
68+
pycparser==2.22
69+
# via cffi
70+
pyparsing==3.2.1
71+
# via oslo-utils
72+
pyyaml==6.0.2
73+
# via
74+
# ansible-core
75+
# kolla-ansible
76+
# oslo-config
77+
# oslo-utils
78+
requests==2.32.3
79+
# via
80+
# hvac
81+
# oslo-config
82+
resolvelib==0.5.4
83+
# via ansible-core
84+
rfc3986==2.0.0
85+
# via oslo-config
86+
stevedore==5.4.0
87+
# via oslo-config
88+
tzdata==2025.1
89+
# via oslo-utils
90+
urllib3==2.3.0
91+
# via requests
92+
wrapt==1.17.2
93+
# via debtcollector

‎requirements/2023.2/debian_12.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
base.in

requirements/2024.2/debian_11.txt renamed to requirements/2023.2/debian_12.txt

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.9
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --output-file=requirements/2024.1/debian_11.txt requirements/2024.1/debian_11.in
5+
# pip-compile --output-file=requirements/2023.2/debian_12.txt requirements/2023.2/debian_12.in
66
#
7-
ansible-core==2.15.12
8-
# via -r requirements/2024.1/debian_11.in
9-
bcrypt==4.2.0
7+
ansible-core==2.15.13
8+
# via -r requirements/2023.2/debian_12.in
9+
bcrypt==4.2.1
1010
# via
1111
# kolla-ansible
1212
# passlib
13-
certifi==2024.8.30
13+
certifi==2024.12.14
1414
# via requests
1515
cffi==1.17.1
1616
# via cryptography
17-
charset-normalizer==3.3.2
17+
charset-normalizer==3.4.1
1818
# via requests
19-
cryptography==43.0.1
19+
cryptography==44.0.0
2020
# via
2121
# ansible-core
2222
# kolla-ansible
@@ -28,35 +28,31 @@ hvac==2.3.0
2828
# via kolla-ansible
2929
idna==3.10
3030
# via requests
31-
importlib-resources==5.0.7
32-
# via ansible-core
3331
iso8601==2.1.0
3432
# via oslo-utils
35-
jinja2==3.1.4
33+
jinja2==3.1.5
3634
# via
3735
# ansible-core
3836
# kolla-ansible
3937
jmespath==1.0.1
4038
# via kolla-ansible
41-
kolla-ansible==18.2.0
42-
# via -r requirements/2024.1/debian_11.in
43-
markupsafe==2.1.5
39+
kolla-ansible==17.7.0
40+
# via -r requirements/2023.2/debian_12.in
41+
markupsafe==3.0.2
4442
# via jinja2
4543
netaddr==1.3.0
4644
# via
4745
# oslo-config
4846
# oslo-utils
49-
netifaces==0.11.0
50-
# via oslo-utils
51-
oslo-config==9.6.0
47+
oslo-config==9.7.0
5248
# via kolla-ansible
53-
oslo-i18n==6.4.0
49+
oslo-i18n==6.5.0
5450
# via
5551
# oslo-config
5652
# oslo-utils
57-
oslo-utils==7.3.0
53+
oslo-utils==8.0.0
5854
# via kolla-ansible
59-
packaging==24.1
55+
packaging==24.2
6056
# via
6157
# ansible-core
6258
# oslo-utils
@@ -67,9 +63,11 @@ pbr==6.1.0
6763
# kolla-ansible
6864
# oslo-i18n
6965
# stevedore
66+
psutil==6.1.1
67+
# via oslo-utils
7068
pycparser==2.22
7169
# via cffi
72-
pyparsing==3.1.4
70+
pyparsing==3.2.1
7371
# via oslo-utils
7472
pyyaml==6.0.2
7573
# via
@@ -85,11 +83,11 @@ resolvelib==1.0.1
8583
# via ansible-core
8684
rfc3986==2.0.0
8785
# via oslo-config
88-
stevedore==5.3.0
86+
stevedore==5.4.0
8987
# via oslo-config
90-
tzdata==2024.2
88+
tzdata==2025.1
9189
# via oslo-utils
92-
urllib3==2.2.3
90+
urllib3==2.3.0
9391
# via requests
94-
wrapt==1.16.0
92+
wrapt==1.17.2
9593
# via debtcollector

‎requirements/2024.1/debian_12.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
base.in

‎requirements/2024.1/debian_12.txt‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
4+
#
5+
# pip-compile --output-file=requirements/2024.1/debian_12.txt requirements/2024.1/debian_12.in
6+
#
7+
ansible-core==2.16.14
8+
# via -r requirements/2024.1/debian_12.in
9+
bcrypt==4.2.1
10+
# via
11+
# kolla-ansible
12+
# passlib
13+
certifi==2024.12.14
14+
# via requests
15+
cffi==1.17.1
16+
# via cryptography
17+
charset-normalizer==3.4.1
18+
# via requests
19+
cryptography==44.0.0
20+
# via
21+
# ansible-core
22+
# kolla-ansible
23+
debtcollector==3.0.0
24+
# via
25+
# oslo-config
26+
# oslo-utils
27+
hvac==2.3.0
28+
# via kolla-ansible
29+
idna==3.10
30+
# via requests
31+
iso8601==2.1.0
32+
# via oslo-utils
33+
jinja2==3.1.5
34+
# via
35+
# ansible-core
36+
# kolla-ansible
37+
jmespath==1.0.1
38+
# via kolla-ansible
39+
kolla-ansible==18.4.0
40+
# via -r requirements/2024.1/debian_12.in
41+
markupsafe==3.0.2
42+
# via jinja2
43+
netaddr==1.3.0
44+
# via
45+
# oslo-config
46+
# oslo-utils
47+
oslo-config==9.7.0
48+
# via kolla-ansible
49+
oslo-i18n==6.5.0
50+
# via
51+
# oslo-config
52+
# oslo-utils
53+
oslo-utils==8.0.0
54+
# via kolla-ansible
55+
packaging==24.2
56+
# via
57+
# ansible-core
58+
# oslo-utils
59+
passlib[bcrypt]==1.7.4
60+
# via kolla-ansible
61+
pbr==6.1.0
62+
# via
63+
# kolla-ansible
64+
# oslo-i18n
65+
# stevedore
66+
psutil==6.1.1
67+
# via oslo-utils
68+
pycparser==2.22
69+
# via cffi
70+
pyparsing==3.2.1
71+
# via oslo-utils
72+
pyyaml==6.0.2
73+
# via
74+
# ansible-core
75+
# kolla-ansible
76+
# oslo-config
77+
# oslo-utils
78+
requests==2.32.3
79+
# via
80+
# hvac
81+
# oslo-config
82+
resolvelib==1.0.1
83+
# via ansible-core
84+
rfc3986==2.0.0
85+
# via oslo-config
86+
stevedore==5.4.0
87+
# via oslo-config
88+
tzdata==2025.1
89+
# via oslo-utils
90+
urllib3==2.3.0
91+
# via requests
92+
wrapt==1.17.2
93+
# via debtcollector

‎requirements/2024.2/debian_12.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
base.in

0 commit comments

Comments
 (0)