Merge pull request #2029 from twangboy/update_bootstrap

Update windows bootstrap for new repo
saltstack · Nov 7, 2024 · aaa123a · aaa123a
2 parents 0d4b031 + 3316de3
commit aaa123a
Show file tree

Hide file tree

Showing 14 changed files with 184 additions and 867 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -145,21 +145,6 @@ jobs:
 
 
 
-  windows-2019:
-    name: Windows 2019
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-windows.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: windows-2019
-      display-name: Windows 2019
-      timeout: 20
-      runs-on: windows-2019
-      instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
-
-
   windows-2022:
     name: Windows 2022
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -218,20 +203,6 @@ jobs:
       instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
 
-  arch:
-    name: Arch
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: arch
-      display-name: Arch
-      timeout: 20
-      instances: '["git-master", "latest", "default"]'
-
-
   centos-stream9:
     name: CentOS Stream 9
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -302,34 +273,6 @@ jobs:
       instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
 
-  gentoo:
-    name: Gentoo
-    if: github.event_name == 'push'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: gentoo
-      display-name: Gentoo
-      timeout: 90
-      instances: '["git-master"]'
-
-
-  gentoo-systemd:
-    name: Gentoo (systemd)
-    if: github.event_name == 'push'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: gentoo-systemd
-      display-name: Gentoo (systemd)
-      timeout: 90
-      instances: '["git-master"]'
-
-
   opensuse-15:
     name: Opensuse 15
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -480,19 +423,15 @@ jobs:
       - generate-actions-workflow
       - macos-12
       - macos-13
-      - windows-2019
       - windows-2022
       - almalinux-8
       - almalinux-9
       - amazon-2
-      - arch
       - centos-stream9
       - debian-11
       - debian-12
       - fedora-39
       - fedora-40
-      - gentoo
-      - gentoo-systemd
       - opensuse-15
       - oraclelinux-8
       - oraclelinux-9

diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
@@ -6,20 +6,15 @@
 
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
-##    "amazon-2023",
-##    "opensuse-tumbleweed",
 LINUX_DISTROS = [
     "almalinux-8",
     "almalinux-9",
     "amazon-2",
-    "arch",
     "centos-stream9",
     "debian-11",
     "debian-12",
     "fedora-39",
     "fedora-40",
-    "gentoo",
-    "gentoo-systemd",
     "opensuse-15",
     "oraclelinux-8",
     "oraclelinux-9",
@@ -31,8 +26,8 @@
     "ubuntu-2204",
     "ubuntu-2404",
 ]
+
 WINDOWS = [
-    "windows-2019",
     "windows-2022",
 ]
 
@@ -41,14 +36,10 @@
     "macos-13",
 ]
 
-
-##    "amazon-2023",
-##    "opensuse-tumbleweed",
 STABLE_DISTROS = [
     "almalinux-8",
     "almalinux-9",
     "amazon-2",
-    "arch",
     "centos-stream9",
     "debian-11",
     "debian-12",
@@ -66,7 +57,6 @@
     "ubuntu-2404",
 ]
 
-##    "amazon-2023",
 ONEDIR_DISTROS = [
     "almalinux-8",
     "almalinux-9",
@@ -99,40 +89,27 @@
     "ubuntu-2404",
 ]
 
-##    "opensuse-tumbleweed",
 BLACKLIST_3006 = [
-    "arch",
     "debian-12",
     "fedora-40",
-    "gentoo",
-    "gentoo-systemd",
     "opensuse-15",
     "ubuntu-2404",
 ]
 
-##    "opensuse-tumbleweed",
 BLACKLIST_3007 = [
-    "arch",
     "fedora-39",
-    "gentoo",
-    "gentoo-systemd",
     "opensuse-15",
     "photon-4",
     "photon-5",
 ]
 
-##    "amazon-2023",
-##    "opensuse-tumbleweed",
 BLACKLIST_GIT_3006 = [
     "almalinux-9",
     "amazon-2",
-    "arch",
     "centos-stream9",
     "debian-11",
     "debian-12",
     "fedora-40",
-    "gentoo",
-    "gentoo-systemd",
     "opensuse-15",
     "oraclelinux-9",
     "photon-4",
@@ -143,19 +120,14 @@
     "ubuntu-2404",
 ]
 
-##    "amazon-2023",
-##    "opensuse-tumbleweed",
 BLACKLIST_GIT_3007 = [
     "almalinux-9",
     "amazon-2",
-    "arch",
     "centos-stream9",
     "debian-11",
     "debian-12",
     "fedora-39",
     "fedora-40",
-    "gentoo",
-    "gentoo-systemd",
     "opensuse-15",
     "oraclelinux-9",
     "photon-4",
@@ -234,25 +206,17 @@
     "rockylinux-8",
 ]
 
-LATEST_PKG_BLACKLIST = [
-    "gentoo",
-    "gentoo-systemd",
-]
+LATEST_PKG_BLACKLIST = []
 
-##    "amazon-2023": "Amazon 2023",
-##    "opensuse-tumbleweed": "Opensuse Tumbleweed",
 DISTRO_DISPLAY_NAMES = {
     "almalinux-8": "AlmaLinux 8",
     "almalinux-9": "AlmaLinux 9",
     "amazon-2": "Amazon 2",
-    "arch": "Arch",
     "centos-stream9": "CentOS Stream 9",
     "debian-11": "Debian 11",
     "debian-12": "Debian 12",
     "fedora-39": "Fedora 39",
     "fedora-40": "Fedora 40",
-    "gentoo": "Gentoo",
-    "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
     "oraclelinux-8": "Oracle Linux 8",
     "oraclelinux-9": "Oracle Linux 9",
@@ -265,19 +229,12 @@
     "ubuntu-2404": "Ubuntu 24.04",
     "macos-12": "macOS 12",
     "macos-13": "macOS 13",
-    "windows-2019": "Windows 2019",
     "windows-2022": "Windows 2022",
 }
 
 TIMEOUT_DEFAULT = 20
-TIMEOUT_OVERRIDES = {
-    "gentoo": 90,
-    "gentoo-systemd": 90,
-}
-VERSION_ONLY_OVERRIDES = [
-    "gentoo",
-    "gentoo-systemd",
-]
+TIMEOUT_OVERRIDES = {}
+VERSION_ONLY_OVERRIDES = []
 
 TEMPLATE = """
   {distro}:

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -41,28 +41,30 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-
       - name: Set up Python 3.10
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
       - name: Install Pytest
         run: |
-          pip install -U pytest
+          pip install -r tests\requirements.txt
 
-      - name: Bootstrap Salt
+      - name: Get Version
         run: |
-          . ./bootstrap-salt.ps1 -RunService $false
+          # We need to get the version here and make it an environment variable
+          # It is used to install via bootstrap and in the test
+          # The version is in the instance name
+          $instance = "${{ matrix.instance }}"
+          $version = $instance -split "-",2
+          if ( $version.Count -gt 1 ) {
+            $version = $version[1].Replace("-", ".")
+          }
+          Write-Output "SaltVersion=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      - name: Set Environment Variables
+      - name: Bootstrap Salt
         run: |
-          $env:Path = "$env:Path;C:\Program Files\Salt Project\Salt"
-          $env:Instance = ${{ matrix.instance }}
-          Write-Output "Path:"
-          Write-Output $env:Path
-          Write-Output "Environment Variables"
-          Get-ChildItem Env:
+          . .\bootstrap-salt.ps1 -RunService $false -Version $env:SaltVersion
 
       - name: Test Bootstrap
         run: |

diff --git a/.gitignore b/.gitignore
@@ -8,9 +8,3 @@ venv
 
 # Pycharm
 .idea
-
-# test-kitchen
-.kitchen.local.yml
-kitchen.local.yml
-.kitchen/
-.bundle/
diff --git a/Gemfile b/Gemfile