From db9ca73942d7dc503a65d3e803f434ff549bbfe5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 20 Jan 2024 18:20:05 +0000 Subject: [PATCH 1/3] Fix some more places where we need to use ``actions/{upload,download}-artifact@v3`` Signed-off-by: Pedro Algarvio --- .github/actions/download-artifact/action.yml | 4 +++- .github/actions/upload-artifact/action.yml | 4 +++- .github/workflows/nightly.yml | 4 +++- .github/workflows/staging.yml | 4 +++- .github/workflows/templates/nightly.yml.jinja | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/actions/download-artifact/action.yml b/.github/actions/download-artifact/action.yml index fd476d5a8fd..12a097f517f 100644 --- a/.github/actions/download-artifact/action.yml +++ b/.github/actions/download-artifact/action.yml @@ -23,7 +23,9 @@ inputs: runs: using: composite steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 + # This needs to be actions/download-artifact@v3 because we upload multiple artifacts + # under the same name something that actions/upload-artifact@v4 does not do. with: name: ${{ inputs.name }} path: ${{ inputs.path }} diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index d1371d134f2..6c9e940a3b3 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -45,7 +45,9 @@ runs: shopt -s globstar || echo "'globstar' not available" tar -cavf ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz ${{ inputs.path }} - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 + # This needs to be actions/upload-artifact@v3 because we upload multiple artifacts + # under the same name something that actions/upload-artifact@v4 does not do. with: name: ${{ inputs.name }} path: ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ba9e6ab43f4..cd04cfe7d8a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2946,7 +2946,9 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - name: Download Repository Artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 + # This needs to be actions/download-artifact@v3 because we upload multiple artifacts + # under the same name something that actions/upload-artifact@v4 does not do. with: name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo path: repo/ diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index b60515493f4..d35ff454704 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2753,7 +2753,9 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - name: Download Repository Artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 + # This needs to be actions/download-artifact@v3 because we upload multiple artifacts + # under the same name something that actions/upload-artifact@v4 does not do. with: name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo path: repo/ diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja index 1487ab8ba26..097ccc7d2bb 100644 --- a/.github/workflows/templates/nightly.yml.jinja +++ b/.github/workflows/templates/nightly.yml.jinja @@ -170,7 +170,9 @@ concurrency: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - name: Download Repository Artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 + # This needs to be actions/download-artifact@v3 because we upload multiple artifacts + # under the same name something that actions/upload-artifact@v4 does not do. with: name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo path: repo/ From 6c12abf3b195ffcbd0ca62a56abadab5733526ba Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 19 Jan 2024 15:28:30 +0000 Subject: [PATCH 2/3] Fix static requirements Signed-off-by: Pedro Algarvio --- requirements/static/ci/py3.12/windows.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index e143d18ffec..082d50df379 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -440,8 +440,6 @@ smmap==5.0.0 # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in -sspilib==0.1.0 - # via pyspnego strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==5.3.0 From a9b16faa75268d6dd08d635f2cb611cf5f0cc17a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 21 Jan 2024 14:04:37 +0000 Subject: [PATCH 3/3] Increase integration tests concurrency Signed-off-by: Pedro Algarvio --- tools/ci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci.py b/tools/ci.py index 8e327c0aaf9..22659ffa30d 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -655,7 +655,7 @@ def matrix( _matrix = [] _splits = { "functional": 3, - "integration": 5, + "integration": 6, "scenarios": 1, "unit": 4, }