diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 7c71b1b99..f82f21e91 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -44,34 +44,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2 - - name: install dependencies - shell: bash - run: | - source /etc/os-release || source /usr/lib/os-release - case ${ID,,} in - 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 - pipx install pip-tools + - uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # 5.3.1 + with: + enable-cache: true - uses: technote-space/create-pr-action@91114507cf92349bec0a9a501c2edf1635427bc5 # 2.1.4 with: EXECUTE_COMMANDS: | - 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' + bash -c 'source /etc/os-release; uv pip compile --output-file="requirements/${{ matrix.os_release }}/${ID,,}_${VERSION_ID%.*}.txt" "requirements/${{ matrix.os_release }}/pyproject.toml" --upgrade' COMMIT_MESSAGE: "Upgrade OpenStack Kolla dependencies" COMMIT_NAME: "electrocucaracha bot" PR_BRANCH_NAME: "versions-update-${PR_ID}" diff --git a/requirements/2023.1/base.in b/requirements/2023.1/base.in deleted file mode 100644 index 9911e8283..000000000 --- a/requirements/2023.1/base.in +++ /dev/null @@ -1,4 +0,0 @@ -ansible>=6,<8 # GPLv3 -ansible-core>2.10,<=2.13 # GPLv3 -kolla-ansible<17.0 # Apache-2.0 -mitogen # BSD diff --git a/requirements/2023.1/debian_11.in b/requirements/2023.1/debian_11.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.1/debian_11.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2023.1/debian_11.txt b/requirements/2023.1/debian_11.txt index 217a45b2e..7a34f72b3 100644 --- a/requirements/2023.1/debian_11.txt +++ b/requirements/2023.1/debian_11.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/2023.1/debian_11.txt requirements/2023.1/debian_11.in # -ansible==6.0.0 +ansible==8.5.0 # via -r requirements/2023.1/debian_11.in ansible-core==2.13.0 # via diff --git a/requirements/2023.1/debian_12.in b/requirements/2023.1/debian_12.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.1/debian_12.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2023.1/debian_12.txt b/requirements/2023.1/debian_12.txt index 6253270f4..386325439 100644 --- a/requirements/2023.1/debian_12.txt +++ b/requirements/2023.1/debian_12.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/2023.1/debian_12.txt requirements/2023.1/debian_12.in # -ansible==6.0.0 +ansible==8.5.0 # via -r requirements/2023.1/debian_12.in ansible-core==2.13.0 # via diff --git a/requirements/2023.1/pyproject.toml b/requirements/2023.1/pyproject.toml new file mode 100644 index 000000000..00a3a7f38 --- /dev/null +++ b/requirements/2023.1/pyproject.toml @@ -0,0 +1,9 @@ +[project] +name = "Antelope" +version= "2023.1" +dependencies = [ + "ansible>=6,<9", # GPLv3 + "ansible-core>2.10,<=2.13", # GPLv3 + "kolla-ansible<17.0", # Apache-2.0 + "mitogen", # BSD +] diff --git a/requirements/2023.1/rocky_9.in b/requirements/2023.1/rocky_9.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.1/rocky_9.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2023.1/rocky_9.txt b/requirements/2023.1/rocky_9.txt index 622026ce5..0f0c8e538 100644 --- a/requirements/2023.1/rocky_9.txt +++ b/requirements/2023.1/rocky_9.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/2023.1/rocky_9.txt requirements/2023.1/rocky_9.in # -ansible==6.0.0 +ansible==8.5.0 # via -r requirements/2023.1/rocky_9.in ansible-core==2.13.0 # via diff --git a/requirements/2023.1/ubuntu_22.in b/requirements/2023.1/ubuntu_22.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.1/ubuntu_22.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2023.1/ubuntu_22.txt b/requirements/2023.1/ubuntu_22.txt index 9e39a910c..e4d8f7d51 100644 --- a/requirements/2023.1/ubuntu_22.txt +++ b/requirements/2023.1/ubuntu_22.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/2023.1/ubuntu_22.txt requirements/2023.1/ubuntu_22.in # -ansible==6.0.0 +ansible==8.5.0 # via -r requirements/2023.1/ubuntu_22.in ansible-core==2.13.0 # via diff --git a/requirements/2023.2/base.in b/requirements/2023.2/base.in deleted file mode 100644 index 6f81e78f2..000000000 --- a/requirements/2023.2/base.in +++ /dev/null @@ -1,2 +0,0 @@ -ansible-core>=2.14,<2.16 # GPLv3 -kolla-ansible<18.0 # Apache-2.0 diff --git a/requirements/2023.2/debian_11.in b/requirements/2023.2/debian_11.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.2/debian_11.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2023.2/debian_12.in b/requirements/2023.2/debian_12.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.2/debian_12.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2023.2/pyproject.toml b/requirements/2023.2/pyproject.toml new file mode 100644 index 000000000..3ea3870df --- /dev/null +++ b/requirements/2023.2/pyproject.toml @@ -0,0 +1,7 @@ +[project] +name = "Bobcat" +version= "2023.2" +dependencies = [ + "ansible-core>=2.14,<2.16", # GPLv3 + "kolla-ansible<18.0", # Apache-2.0 +] diff --git a/requirements/2023.2/rocky_9.in b/requirements/2023.2/rocky_9.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.2/rocky_9.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2023.2/ubuntu_22.in b/requirements/2023.2/ubuntu_22.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2023.2/ubuntu_22.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2024.1/base.in b/requirements/2024.1/base.in deleted file mode 100644 index fbca9a4f0..000000000 --- a/requirements/2024.1/base.in +++ /dev/null @@ -1,2 +0,0 @@ -ansible-core>=2.15,<2.16.99 # GPLv3 -kolla-ansible<19.0 # Apache-2.0 diff --git a/requirements/2024.1/debian_11.in b/requirements/2024.1/debian_11.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2024.1/debian_11.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2024.1/debian_12.in b/requirements/2024.1/debian_12.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2024.1/debian_12.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2024.1/pyproject.toml b/requirements/2024.1/pyproject.toml new file mode 100644 index 000000000..921000cb7 --- /dev/null +++ b/requirements/2024.1/pyproject.toml @@ -0,0 +1,7 @@ +[project] +name ="Caracal" +version= "2024.1" +dependencies = [ + "ansible-core>=2.15,<2.16.99", # GPLv3 + "kolla-ansible<19.0", # Apache-2.0 +] diff --git a/requirements/2024.1/rocky_9.in b/requirements/2024.1/rocky_9.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2024.1/rocky_9.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2024.1/ubuntu_22.in b/requirements/2024.1/ubuntu_22.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2024.1/ubuntu_22.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2024.2/base.in b/requirements/2024.2/base.in deleted file mode 100644 index c86cd69f9..000000000 --- a/requirements/2024.2/base.in +++ /dev/null @@ -1,2 +0,0 @@ -ansible-core>=2.16,<2.17.99 # GPLv3 -kolla-ansible<20.0 # Apache-2.0 diff --git a/requirements/2024.2/debian_12.in b/requirements/2024.2/debian_12.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2024.2/debian_12.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2024.2/pyproject.toml b/requirements/2024.2/pyproject.toml new file mode 100644 index 000000000..69b65388f --- /dev/null +++ b/requirements/2024.2/pyproject.toml @@ -0,0 +1,7 @@ +[project] +name ="Dalmatian" +version= "2024.2" +dependencies = [ + "ansible-core>=2.16,<2.17.99", # GPLv3 + "kolla-ansible<20.0", # Apache-2.0 +] diff --git a/requirements/2024.2/rocky_9.in b/requirements/2024.2/rocky_9.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2024.2/rocky_9.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/2024.2/ubuntu_22.in b/requirements/2024.2/ubuntu_22.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/2024.2/ubuntu_22.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file