Enable download test on Windows

saltstack · Sep 24, 2024 · 6443c91 · 6443c91
1 parent 0007447
commit 6443c91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/test-packages-action-windows.yml b/.github/workflows/test-packages-action-windows.yml
@@ -70,6 +70,7 @@ env:
   PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
+  USE_S3_CACHE: 'true'
 
 jobs:
 
@@ -102,7 +103,7 @@ jobs:
       - name: Generate Package Test Matrix
         id: generate-pkg-matrix
         run: |
-          tools ci pkg-matrix ${{ inputs.fips && '--fips ' || '' }}${{ inputs.distro-slug }} \
+          tools ci pkg-matrix ${{ inputs.distro-slug }} \
             ${{ inputs.pkg-type }} --testing-releases ${{ join(fromJSON(inputs.testing-releases), ' ') }}
 
 
@@ -198,7 +199,7 @@ jobs:
 
       - name: Run Package Tests
         run: |
-          tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install ${{ matrix.fips && '--fips ' || '' }}\
+          tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
           --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.tests-chunk }} \
           ${{ matrix.version && format('--prev-version={0}', matrix.version) || ''}}
 
@@ -246,8 +247,8 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
           pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*

diff --git a/tests/pytests/pkg/download/test_pkg_download.py b/tests/pytests/pkg/download/test_pkg_download.py
@@ -598,7 +598,6 @@ def salt_test_command(request, install_dir):
     return command
 
 
-@pytest.mark.skip_on_windows(reason="This is flaky on Windows")
 @pytest.mark.parametrize("salt_test_command", get_salt_test_commands(), indirect=True)
 def test_download(shell, salt_test_command):
     """

diff --git a/tools/ci.py b/tools/ci.py
@@ -859,8 +859,9 @@ def pkg_matrix(
         # Uses a jmespath expression to test if the wanted version is in any of the filenames
         key_filter = f"Contents[?contains(Key, '{version}')][]"
         if pkg_type == "MSI":
-            # TODO: Add this back when we add MSI upgrade and downgrade tests
-            # key_filter = f"Contents[?contains(Key, '{version}')] | [?ends_with(Key, '.msi')]"
+            key_filter = (
+                f"Contents[?contains(Key, '{version}')] | [?ends_with(Key, '.msi')]"
+            )
             continue
         elif pkg_type == "NSIS":
             key_filter = (
@@ -897,7 +898,7 @@ def pkg_matrix(
         and "macos" in distro_slug
         and "arm64" in distro_slug
     ):
-        ctx.warn("Forks don't have access to MacOS 13 Arm64. Clearning the matrix.")
+        ctx.warn("Forks don't have access to MacOS 13 Arm64. Clearing the matrix.")
         _matrix.clear()
 
     if not _matrix: