Get version from instance name

.github/workflows/ci.yml

@@ -27,8 +27,6 @@ jobs:
           separator: ","
           files: |
             bootstrap-salt.*
-            Gemfile
-            kitchen*.yml
             tests/**
             .github/workflows/**
           files_ignore: |

.github/workflows/templates/ci.yml

@@ -27,8 +27,6 @@ jobs:
           separator: ","
           files: |
             bootstrap-salt.*
-            Gemfile
-            kitchen*.yml
             tests/**
             .github/workflows/**
           files_ignore: |

.github/workflows/test-windows.yml

@@ -50,13 +50,21 @@ jobs:
         run: |
           pip install -U pytest
 
-      - 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: Add Salt to Path
+      - name: Bootstrap Salt
         run: |
-          $env:Path = "$env:Path;C:\Program Files\Salt Project\Salt"
+          . .\bootstrap-salt.ps1 -RunService $false -Version $env:SaltVersion
 
       - name: Test Bootstrap
         run: |

.gitignore

@@ -8,9 +8,3 @@ venv
 
 # Pycharm
 .idea
-
-# test-kitchen
-.kitchen.local.yml
-kitchen.local.yml
-.kitchen/
-.bundle/

tests/conftest.py

@@ -13,18 +13,7 @@ def target_python_version():
 
 @pytest.fixture(scope="session")
 def target_salt_version():
-    bootstrap_types = ("git", "stable", "onedir", "onedir_rc")
-
-    # filter out any bootstrap types and then join
-    target_salt = ".".join(
-        [
-            item
-            for item in os.environ.get("KITCHEN_SUITE", "").split("-")
-            if item not in bootstrap_types
-        ]
-    )
-
-    # target_salt = os.environ["KITCHEN_SUITE"].split("-", 1)[-1].replace("-", ".")
+    target_salt = os.environ.get("SaltVersion", "")
 
     if target_salt.startswith("v"):
         target_salt = target_salt[1:]