From 4f9db07142b0c92ee9d2b67e19c194d00de66a92 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Sat, 2 Nov 2024 02:30:04 -0700
Subject: [PATCH] meh

---
 .../workflows/test-packages-action-linux.yml  | 15 +++---
 .../test-packages-action-windows.yml          |  2 +-
 tools/ci.py                                   | 51 +++++++++----------
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/test-packages-action-linux.yml b/.github/workflows/test-packages-action-linux.yml
index d3f1e3ac6a3..b9278237d62 100644
--- a/.github/workflows/test-packages-action-linux.yml
+++ b/.github/workflows/test-packages-action-linux.yml
@@ -171,6 +171,10 @@ jobs:
         with:
           name: nox-linux-${{ inputs.arch }}-${{ inputs.nox-session }}
 
+      - name: Decompress .nox Directory
+        run: |
+          nox --force-color -e decompress-dependencies -- linux ${{ inputs.arch }}
+
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
@@ -180,14 +184,13 @@ jobs:
         run: |
           tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true
 
-      - name: Decompress .nox Directory
-        run: |
-          nox --force-color -e decompress-dependencies -- macos ${{ inputs.arch }}
-
       - name: Show System Info
+        env:
+          SKIP_REQUIREMENTS_INSTALL: "1"
+          PRINT_SYSTEM_INFO_ONLY: "1"
         run: |
-          tools --timestamps --timeout-secs=1800 vm test --skip-requirements-install --print-system-information-only \
-            --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- ${{ matrix.tests-chunk }}
+          sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.tests-chunk }}
+
       #- name: Run Package Tests
       #  run: |
       #    tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install ${{ inputs.fips && '--fips ' || '' }}\
diff --git a/.github/workflows/test-packages-action-windows.yml b/.github/workflows/test-packages-action-windows.yml
index b716f98d68a..87adcf513e3 100644
--- a/.github/workflows/test-packages-action-windows.yml
+++ b/.github/workflows/test-packages-action-windows.yml
@@ -211,7 +211,7 @@ jobs:
         run: |
           # Delete the salt onedir, we won't need it anymore and it will prevent
           # from it showing in the tree command below
-          deltree artifacts/salt
+          rmdir /S /Qa rtifacts/salt
           tree -a artifacts
 
       - name: Upload Test Run Artifacts
diff --git a/tools/ci.py b/tools/ci.py
index d83acf0f1a0..3cfba6dda63 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -26,16 +26,16 @@ if sys.version_info < (3, 11):
 else:
     from typing import NotRequired, TypedDict  # pylint: disable=no-name-in-module
 
-try:
-    import boto3
-except ImportError:
-    print(
-        "\nPlease run 'python -m pip install -r "
-        "requirements/static/ci/py{}.{}/tools.txt'\n".format(*sys.version_info),
-        file=sys.stderr,
-        flush=True,
-    )
-    raise
+# try:
+#     import boto3
+# except ImportError:
+#     print(
+#         "\nPlease run 'python -m pip install -r "
+#         "requirements/static/ci/py{}.{}/tools.txt'\n".format(*sys.version_info),
+#         file=sys.stderr,
+#         flush=True,
+#     )
+#     raise
 
 log = logging.getLogger(__name__)
 
@@ -879,23 +879,22 @@ def pkg_matrix(
             )
             continue
         # objects = list(page_iterator.search(key_filter))
-        objects = []
         # Testing using `any` because sometimes the paginator returns `[None]`
-        if any(objects):
-            ctx.info(
-                f"Found {version} ({backend}) for {distro_slug}: {objects[0]['Key']}"
-            )
-            for session in ("upgrade", "downgrade"):
-                if backend == "classic":
-                    session += "-classic"
-                _matrix.append(
-                    {
-                        "tests-chunk": session,
-                        "version": str(version),
-                    }
-                )
-        else:
-            ctx.info(f"No {version} ({backend}) for {distro_slug} at {prefix}")
+        # if any(objects):
+        #     ctx.info(
+        #         f"Found {version} ({backend}) for {distro_slug}: {objects[0]['Key']}"
+        #     )
+        #     for session in ("upgrade", "downgrade"):
+        #         if backend == "classic":
+        #             session += "-classic"
+        #         _matrix.append(
+        #             {
+        #                 "tests-chunk": session,
+        #                 "version": str(version),
+        #             }
+        #         )
+        # else:
+        #     ctx.info(f"No {version} ({backend}) for {distro_slug} at {prefix}")
 
     ctx.info("Generated matrix:")
     if not _matrix: