Fix Supported Operating Systems Matrix

electrocucaracha · Jan 22, 2025 · 0ab83ac · 0ab83ac
1 parent be78a9f
commit 0ab83ac
Show file tree

Hide file tree

Showing 10 changed files with 386 additions and 57 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -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
@@ -44,17 +52,26 @@ jobs:
               ubuntu|debian)
                   apt update
                   INSTALLER_CMD="apt-get -y --no-install-recommends -q=3 install"
+                  if [[ $VERSION_ID == "11" ]]; then
+                      $INSTALLER_CMD python3-pip python3-venv git
+                      python3 -m pip install pipx
+                  else
+                      $INSTALLER_CMD pipx git
+                  fi
               ;;
               rhel|centos|fedora|rocky)
                   INSTALLER_CMD="$(command -v dnf || command -v yum) -y --quiet --errorlevel=0 install"
+                  $INSTALLER_CMD python3.12 git python3.12-pip
+                  rm -f /usr/bin/python3
+                  ln -s /usr/bin/python3.12 /usr/bin/python3
+                  python3 -m pip install pipx
               ;;
           esac
-          $INSTALLER_CMD python3-pip git
-          pip3 install pip-tools
+          pipx 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 /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'
           COMMIT_MESSAGE: "Upgrade OpenStack Kolla dependencies"
           COMMIT_NAME: "electrocucaracha bot"
           PR_BRANCH_NAME: "versions-update-${PR_ID}"

diff --git a/requirements/2024.2/debian_11.in → requirements/2023.1/debian_12.in b/requirements/2024.2/debian_11.in → requirements/2023.1/debian_12.in
diff --git a/requirements/2023.1/debian_12.txt b/requirements/2023.1/debian_12.txt
@@ -0,0 +1,93 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --output-file=requirements/2023.1/debian_12.txt requirements/2023.1/debian_12.in
+#
+ansible==6.0.0
+    # via -r requirements/2023.1/debian_12.in
+ansible-core==2.13.0
+    # via
+    #   -r requirements/2023.1/debian_12.in
+    #   ansible
+certifi==2024.12.14
+    # via requests
+cffi==1.17.1
+    # via cryptography
+charset-normalizer==3.4.1
+    # via requests
+cryptography==44.0.0
+    # via
+    #   ansible-core
+    #   kolla-ansible
+debtcollector==3.0.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+hvac==2.3.0
+    # via kolla-ansible
+idna==3.10
+    # via requests
+iso8601==2.1.0
+    # via oslo-utils
+jinja2==3.1.5
+    # via
+    #   ansible-core
+    #   kolla-ansible
+jmespath==1.0.1
+    # via kolla-ansible
+kolla-ansible==16.7.0
+    # via -r requirements/2023.1/debian_12.in
+markupsafe==3.0.2
+    # via jinja2
+mitogen==0.3.21
+    # via -r requirements/2023.1/debian_12.in
+netaddr==1.3.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+oslo-config==9.7.0
+    # via kolla-ansible
+oslo-i18n==6.5.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+oslo-utils==8.0.0
+    # via kolla-ansible
+packaging==24.2
+    # via
+    #   ansible-core
+    #   oslo-utils
+pbr==6.1.0
+    # via
+    #   kolla-ansible
+    #   oslo-i18n
+    #   stevedore
+psutil==6.1.1
+    # via oslo-utils
+pycparser==2.22
+    # via cffi
+pyparsing==3.2.1
+    # via oslo-utils
+pyyaml==6.0.2
+    # via
+    #   ansible-core
+    #   kolla-ansible
+    #   oslo-config
+    #   oslo-utils
+requests==2.32.3
+    # via
+    #   hvac
+    #   oslo-config
+resolvelib==0.5.4
+    # via ansible-core
+rfc3986==2.0.0
+    # via oslo-config
+stevedore==5.4.0
+    # via oslo-config
+tzdata==2025.1
+    # via oslo-utils
+urllib3==2.3.0
+    # via requests
+wrapt==1.17.2
+    # via debtcollector
diff --git a/requirements/2023.2/debian_12.in b/requirements/2023.2/debian_12.in
@@ -0,0 +1 @@
+base.in
diff --git a/requirements/2024.2/debian_11.txt → requirements/2023.2/debian_12.txt b/requirements/2024.2/debian_11.txt → requirements/2023.2/debian_12.txt
@@ -1,22 +1,22 @@
 #
-# 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/2023.2/debian_12.txt requirements/2023.2/debian_12.in
 #
-ansible-core==2.15.12
-    # via -r requirements/2024.1/debian_11.in
-bcrypt==4.2.0
+ansible-core==2.15.13
+    # via -r requirements/2023.2/debian_12.in
+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
+cryptography==44.0.0
     # via
     #   ansible-core
     #   kolla-ansible
@@ -28,35 +28,31 @@ 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==17.7.0
+    # via -r requirements/2023.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
@@ -67,9 +63,11 @@ pbr==6.1.0
     #   kolla-ansible
     #   oslo-i18n
     #   stevedore
+psutil==6.1.1
+    # via oslo-utils
 pycparser==2.22
     # via cffi
-pyparsing==3.1.4
+pyparsing==3.2.1
     # via oslo-utils
 pyyaml==6.0.2
     # via
@@ -85,11 +83,11 @@ resolvelib==1.0.1
     # via ansible-core
 rfc3986==2.0.0
     # via oslo-config
-stevedore==5.3.0
+stevedore==5.4.0
     # via oslo-config
-tzdata==2024.2
+tzdata==2025.1
     # via oslo-utils
-urllib3==2.2.3
+urllib3==2.3.0
     # via requests
-wrapt==1.16.0
+wrapt==1.17.2
     # via debtcollector
diff --git a/requirements/2024.1/debian_12.in b/requirements/2024.1/debian_12.in
@@ -0,0 +1 @@
+base.in
diff --git a/requirements/2024.1/debian_12.txt b/requirements/2024.1/debian_12.txt
@@ -0,0 +1,93 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --output-file=requirements/2024.1/debian_12.txt requirements/2024.1/debian_12.in
+#
+ansible-core==2.16.14
+    # via -r requirements/2024.1/debian_12.in
+bcrypt==4.2.1
+    # via
+    #   kolla-ansible
+    #   passlib
+certifi==2024.12.14
+    # via requests
+cffi==1.17.1
+    # via cryptography
+charset-normalizer==3.4.1
+    # via requests
+cryptography==44.0.0
+    # via
+    #   ansible-core
+    #   kolla-ansible
+debtcollector==3.0.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+hvac==2.3.0
+    # via kolla-ansible
+idna==3.10
+    # via requests
+iso8601==2.1.0
+    # via oslo-utils
+jinja2==3.1.5
+    # via
+    #   ansible-core
+    #   kolla-ansible
+jmespath==1.0.1
+    # via kolla-ansible
+kolla-ansible==18.4.0
+    # via -r requirements/2024.1/debian_12.in
+markupsafe==3.0.2
+    # via jinja2
+netaddr==1.3.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+oslo-config==9.7.0
+    # via kolla-ansible
+oslo-i18n==6.5.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+oslo-utils==8.0.0
+    # via kolla-ansible
+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
+psutil==6.1.1
+    # via oslo-utils
+pycparser==2.22
+    # via cffi
+pyparsing==3.2.1
+    # via oslo-utils
+pyyaml==6.0.2
+    # via
+    #   ansible-core
+    #   kolla-ansible
+    #   oslo-config
+    #   oslo-utils
+requests==2.32.3
+    # via
+    #   hvac
+    #   oslo-config
+resolvelib==1.0.1
+    # via ansible-core
+rfc3986==2.0.0
+    # via oslo-config
+stevedore==5.4.0
+    # via oslo-config
+tzdata==2025.1
+    # via oslo-utils
+urllib3==2.3.0
+    # via requests
+wrapt==1.17.2
+    # via debtcollector
diff --git a/requirements/2024.2/debian_12.in b/requirements/2024.2/debian_12.in
@@ -0,0 +1 @@
+base.in