From 7e64eb4bd6901c9b160f5585e914307619011383 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 4 Jan 2024 12:03:55 +0000 Subject: [PATCH 1/4] Bump to `actions/setup-python@v5` Signed-off-by: Pedro Algarvio --- .github/workflows/build-deps-ci-action.yml | 2 +- .github/workflows/build-deps-onedir.yml | 4 ++-- .github/workflows/build-packages.yml | 4 ++-- .github/workflows/build-salt-onedir.yml | 4 ++-- .github/workflows/ci.yml | 8 ++++---- .github/workflows/nightly.yml | 8 ++++---- .github/workflows/release-tag.yml | 2 +- .github/workflows/release-update-winrepo.yml | 2 +- .github/workflows/release-upload-virustotal.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/scheduled.yml | 8 ++++---- .github/workflows/staging.yml | 4 ++-- .../workflows/templates/build-deps-ci-action.yml.jinja | 2 +- .github/workflows/templates/ci.yml.jinja | 6 +++--- .github/workflows/templates/layout.yml.jinja | 2 +- .github/workflows/templates/release.yml.jinja | 2 +- .../templates/test-package-downloads-action.yml.jinja | 2 +- .github/workflows/test-action-macos.yml | 4 ++-- .github/workflows/test-package-downloads-action.yml | 2 +- .github/workflows/test-packages-action-macos.yml | 4 ++-- .github/workflows/triage.yml | 2 +- 21 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 6352797c9b1..fcdd9f37714 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -203,7 +203,7 @@ jobs: - name: Set up Python ${{ inputs.python-version }} if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.python-version }}" diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index 0ad923060f1..d99fc0e2461 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -105,7 +105,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -153,7 +153,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 266c9e064e6..6e1ec435da0 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -84,7 +84,7 @@ jobs: fi - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.11 @@ -387,7 +387,7 @@ jobs: fi - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.11 diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 9c0e2aa7da6..eb807bd7fed 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -165,7 +165,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1944e0a0c0..a6fb1750bcb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,7 +133,7 @@ jobs: - *pkg_tests_added_modified - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -285,7 +285,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -420,7 +420,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -2083,7 +2083,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 81aa23aacb1..14ab0d10fc5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -185,7 +185,7 @@ jobs: - *pkg_tests_added_modified - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -337,7 +337,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -472,7 +472,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -2143,7 +2143,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 85154bd59fa..66c16da7f97 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -54,7 +54,7 @@ jobs: custom_tag: ${{ github.event.inputs.saltVersion }} - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.8 diff --git a/.github/workflows/release-update-winrepo.yml b/.github/workflows/release-update-winrepo.yml index 7a400403197..701c56d3cae 100644 --- a/.github/workflows/release-update-winrepo.yml +++ b/.github/workflows/release-update-winrepo.yml @@ -34,7 +34,7 @@ jobs: repository: saltstack/salt-winrepo-ng - name: Set Up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/release-upload-virustotal.yml b/.github/workflows/release-upload-virustotal.yml index da13d83ca80..50e71594d50 100644 --- a/.github/workflows/release-upload-virustotal.yml +++ b/.github/workflows/release-upload-virustotal.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v4 - name: Set Up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb8e3621e28..bb3ea8ddd48 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: fetch-depth: 0 # Full clone to also get the tags to get the right salt version - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 8d6634cd869..ffa6a1b36db 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -175,7 +175,7 @@ jobs: - *pkg_tests_added_modified - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -327,7 +327,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -462,7 +462,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -2125,7 +2125,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 5425fbf8b25..4bf3fa6e717 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -163,7 +163,7 @@ jobs: - *pkg_tests_added_modified - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -459,7 +459,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/templates/build-deps-ci-action.yml.jinja b/.github/workflows/templates/build-deps-ci-action.yml.jinja index e9c16833101..100edcab7c4 100644 --- a/.github/workflows/templates/build-deps-ci-action.yml.jinja +++ b/.github/workflows/templates/build-deps-ci-action.yml.jinja @@ -203,7 +203,7 @@ jobs: - name: Set up Python ${{ inputs.python-version }} if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.python-version }}" diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 0a6fbbe0467..b566e280ca4 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -62,7 +62,7 @@ <%- if not prepare_actual_release %> - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -215,7 +215,7 @@ - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -318,7 +318,7 @@ - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 06d81fd8a25..e768a8cfc46 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -181,7 +181,7 @@ jobs: - *pkg_tests_added_modified - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index 1417a7e9306..073a3c80677 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -93,7 +93,7 @@ permissions: fetch-depth: 0 # Full clone to also get the tags to get the right salt version - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index 2a5b8310364..4cb2802ce0b 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -335,7 +335,7 @@ jobs: tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.python-version }}" update-environment: true diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 49163caa876..2860e45f484 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -155,7 +155,7 @@ jobs: fail-on-cache-miss: true - name: Set up Python ${{ inputs.gh-actions-python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.gh-actions-python-version }}" @@ -403,7 +403,7 @@ jobs: tree -a artifacts - name: Set up Python ${{ inputs.gh-actions-python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.gh-actions-python-version }}" diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 12d3da43a96..ccc5ca7de19 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -487,7 +487,7 @@ jobs: tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.python-version }}" update-environment: true diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index af8ce9c4ade..2ebde6b0d7c 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -152,7 +152,7 @@ jobs: tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.python-version }}" @@ -251,7 +251,7 @@ jobs: tree -a artifacts - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ inputs.python-version }}" diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 7d0ad560116..612460f6b56 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.8 From e744d21767b8bc5c7d7d888ec6b5f45ae206f622 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 5 Jan 2024 11:43:55 +0000 Subject: [PATCH 2/4] Prefer github hosted runners in favor of self hosted runners for reports Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-linux.yml | 5 +---- .github/workflows/test-action-windows.yml | 5 +---- .github/workflows/test-packages-action-linux.yml | 5 +---- .github/workflows/test-packages-action-windows.yml | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-action-linux.yml b/.github/workflows/test-action-linux.yml index d79aefdf490..6715e43337c 100644 --- a/.github/workflows/test-action-linux.yml +++ b/.github/workflows/test-action-linux.yml @@ -335,10 +335,7 @@ jobs: report: name: Test Reports if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - runs-on: - - self-hosted - - linux - - x86_64 + runs-on: ubuntu-latest needs: - test diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml index 0c9d4272e7f..938e9d44960 100644 --- a/.github/workflows/test-action-windows.yml +++ b/.github/workflows/test-action-windows.yml @@ -335,10 +335,7 @@ jobs: report: name: Test Reports if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - runs-on: - - self-hosted - - linux - - x86_64 + runs-on: ubuntu-latest needs: - test diff --git a/.github/workflows/test-packages-action-linux.yml b/.github/workflows/test-packages-action-linux.yml index 4d80c2ffa9a..377410c820f 100644 --- a/.github/workflows/test-packages-action-linux.yml +++ b/.github/workflows/test-packages-action-linux.yml @@ -240,10 +240,7 @@ jobs: report: name: Report - runs-on: - - self-hosted - - linux - - x86_64 + runs-on: ubuntu-latest if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped' needs: - test diff --git a/.github/workflows/test-packages-action-windows.yml b/.github/workflows/test-packages-action-windows.yml index 0855b48606c..5a9aaae7da3 100644 --- a/.github/workflows/test-packages-action-windows.yml +++ b/.github/workflows/test-packages-action-windows.yml @@ -240,10 +240,7 @@ jobs: report: name: Report - runs-on: - - self-hosted - - linux - - x86_64 + runs-on: ubuntu-latest if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped' needs: - test From dc00efabf37bddbed1dac75a89645a20a1f892d8 Mon Sep 17 00:00:00 2001 From: Shane Lee Date: Mon, 8 Jan 2024 13:00:23 -0700 Subject: [PATCH 3/4] Update bootstrap script in 3006.x branch --- salt/cloud/deploy/bootstrap-salt.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/salt/cloud/deploy/bootstrap-salt.sh b/salt/cloud/deploy/bootstrap-salt.sh index f66aeea3a8a..c632146e44a 100644 --- a/salt/cloud/deploy/bootstrap-salt.sh +++ b/salt/cloud/deploy/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2023.11.07" +__ScriptVersion="2024.01.04" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" @@ -596,6 +596,7 @@ fi echoinfo "Running version: ${__ScriptVersion}" echoinfo "Executed by: ${CALLER}" echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'" +echowarn "Running the unstable version of ${__ScriptName}" # Define installation type if [ "$#" -gt 0 ];then @@ -1521,9 +1522,9 @@ __check_dpkg_architecture() { if [ "$_CUSTOM_REPO_URL" != "null" ]; then warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents." else - # Saltstack official repository has arm64 metadata beginning with Debian 11, + # Saltstack official repository has arm64 metadata beginning with Debian 10, # use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent - if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then + if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then __REPO_ARCH="amd64" else __REPO_ARCH="arm64" From 31ac2414c197b4f8265c571c6254d58bbf466d53 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 9 Jan 2024 14:25:56 +0000 Subject: [PATCH 4/4] Remove unnecessary workflow steps while still showing the information Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 6 -- .github/workflows/nightly.yml | 6 -- .github/workflows/release.yml | 5 -- .github/workflows/scheduled.yml | 6 -- .github/workflows/staging.yml | 6 -- .github/workflows/templates/layout.yml.jinja | 6 -- .github/workflows/templates/release.yml.jinja | 5 -- tools/ci.py | 70 +++++++++---------- 8 files changed, 32 insertions(+), 78 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6fb1750bcb..18ecece75a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,12 +222,6 @@ jobs: run: | tools ci get-testing-releases ${{ join(fromJSON(steps.get-salt-releases.outputs.releases), ' ') }} --salt-version ${{ steps.setup-salt-version.outputs.salt-version }} - - name: Check Salt Releases - run: | - echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.' - echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.' - echo '${{ steps.get-testing-releases.outputs.testing-releases }}' | jq -C '.' - - name: Define Testrun id: define-testrun run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 14ab0d10fc5..edeb1a5d3d6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -274,12 +274,6 @@ jobs: run: | tools ci get-testing-releases ${{ join(fromJSON(steps.get-salt-releases.outputs.releases), ' ') }} --salt-version ${{ steps.setup-salt-version.outputs.salt-version }} - - name: Check Salt Releases - run: | - echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.' - echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.' - echo '${{ steps.get-testing-releases.outputs.testing-releases }}' | jq -C '.' - - name: Define Testrun id: define-testrun run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb3ea8ddd48..38cf3133d17 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,11 +107,6 @@ jobs: run: | tools ci get-releases - - name: Check Salt Releases - run: | - echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.' - echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.' - - name: Set Cache Seed Output id: set-cache-seed run: | diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index ffa6a1b36db..590ea4cd526 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -264,12 +264,6 @@ jobs: run: | tools ci get-testing-releases ${{ join(fromJSON(steps.get-salt-releases.outputs.releases), ' ') }} --salt-version ${{ steps.setup-salt-version.outputs.salt-version }} - - name: Check Salt Releases - run: | - echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.' - echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.' - echo '${{ steps.get-testing-releases.outputs.testing-releases }}' | jq -C '.' - - name: Define Testrun id: define-testrun run: | diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 4bf3fa6e717..be7fec26f08 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -261,12 +261,6 @@ jobs: run: | tools ci get-testing-releases ${{ join(fromJSON(steps.get-salt-releases.outputs.releases), ' ') }} --salt-version ${{ steps.setup-salt-version.outputs.salt-version }} - - name: Check Salt Releases - run: | - echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.' - echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.' - echo '${{ steps.get-testing-releases.outputs.testing-releases }}' | jq -C '.' - - name: Define Testrun id: define-testrun run: | diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index e768a8cfc46..bcadc3c0b02 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -286,12 +286,6 @@ jobs: run: | tools ci get-testing-releases ${{ join(fromJSON(steps.get-salt-releases.outputs.releases), ' ') }} --salt-version ${{ steps.setup-salt-version.outputs.salt-version }} - - name: Check Salt Releases - run: | - echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.' - echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.' - echo '${{ steps.get-testing-releases.outputs.testing-releases }}' | jq -C '.' - - name: Define Testrun id: define-testrun run: | diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index 073a3c80677..704e2ec940b 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -135,11 +135,6 @@ permissions: run: | tools ci get-releases - - name: Check Salt Releases - run: | - echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.' - echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.' - - name: Set Cache Seed Output id: set-cache-seed run: | diff --git a/tools/ci.py b/tools/ci.py index 4c034ff8f34..d315f9a316c 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -892,15 +892,15 @@ def get_releases(ctx: Context, repository: str = "saltstack/salt"): """ Generate the latest salt release. """ + releases = tools.utils.get_salt_releases(ctx, repository) + str_releases = [str(version) for version in releases] + latest = str_releases[-1] + + ctx.info("Releases:", sorted(str_releases)) + ctx.info(f"Latest Release: '{latest}'") + github_output = os.environ.get("GITHUB_OUTPUT") - - if github_output is None: - ctx.exit(1, "The 'GITHUB_OUTPUT' variable is not set.") - else: - releases = tools.utils.get_salt_releases(ctx, repository) - str_releases = [str(version) for version in releases] - latest = str_releases[-1] - + if github_output is not None: with open(github_output, "a", encoding="utf-8") as wfh: wfh.write(f"latest-release={latest}\n") wfh.write(f"releases={json.dumps(str_releases)}\n") @@ -1093,40 +1093,34 @@ def get_testing_releases( """ Get a list of releases to use for the upgrade and downgrade tests. """ + # We aren't testing upgrades from anything before 3006.0 except the latest 3005.x + threshold_major = 3005 + parsed_salt_version = tools.utils.Version(salt_version) + # We want the latest 4 major versions, removing the oldest if this version is a new major + num_major_versions = 4 + if parsed_salt_version.minor == 0: + num_major_versions = 3 + majors = sorted( + list( + {version.major for version in releases if version.major >= threshold_major} + ) + )[-num_major_versions:] + testing_releases = [] + # Append the latest minor for each major + for major in majors: + minors_of_major = [version for version in releases if version.major == major] + testing_releases.append(minors_of_major[-1]) + + str_releases = [str(version) for version in testing_releases] + + ctx.info("Testing Releases:", sorted(str_releases)) + github_output = os.environ.get("GITHUB_OUTPUT") - if github_output is None: - ctx.exit(1, "The 'GITHUB_OUTPUT' variable is not set.") - else: - # We aren't testing upgrades from anything before 3006.0 except the latest 3005.x - threshold_major = 3005 - parsed_salt_version = tools.utils.Version(salt_version) - # We want the latest 4 major versions, removing the oldest if this version is a new major - num_major_versions = 4 - if parsed_salt_version.minor == 0: - num_major_versions = 3 - majors = sorted( - list( - { - version.major - for version in releases - if version.major >= threshold_major - } - ) - )[-num_major_versions:] - testing_releases = [] - # Append the latest minor for each major - for major in majors: - minors_of_major = [ - version for version in releases if version.major == major - ] - testing_releases.append(minors_of_major[-1]) - - str_releases = [str(version) for version in testing_releases] - + if github_output is not None: with open(github_output, "a", encoding="utf-8") as wfh: wfh.write(f"testing-releases={json.dumps(str_releases)}\n") - ctx.exit(0) + ctx.exit(0) @ci.command(