Parse versions from artifactory

.github/workflows/test-windows.yml

@@ -48,7 +48,7 @@ jobs:
 
       - name: Install Pytest
         run: |
-          pip install -U pytest
+          pip install -r tests\requirements.txt
 
       - name: Get Version
         run: |

bootstrap-salt.ps1

@@ -401,32 +401,41 @@ $psobj = $response.ToString() | ConvertFrom-Json
 $filtered = $psobj.children | Where-Object -Property folder -EQ $true
 
 # Get each uri and add it to the list of versions
-$versions = [System.Collections.ArrayList]@()
+$available_versions = [System.Collections.ArrayList]@()
 $filtered | Select-Object -Property uri | ForEach-Object {
-    $versions.Add($_.uri.Trim("/")) | Out-Null
+    $available_versions.Add($_.uri.Trim("/")) | Out-Null
 }
 
-# last one in the list is the latest
-$latest = $versions | Select-Object -Last 1
-
-Write-Verbose "Available versions:"
-$versions | ForEach-Object {
-    Write-Verbose $_
+# Create a versions table, similar to repo.json
+# This will have the latest version available, the latest version available for
+# each major version, and every version available. This makes the version
+# lookup logic easier. You can view the contents of the versions table by
+# passing the -Verbose command
+$latest = $available_versions | Select-Object -Last 1
+$versions_table = [ordered]@{"latest"=$latest}
+
+$available_versions | ForEach-Object {
+    $versions_table[$(Get-MajorVersion $_)] = $_
+    $versions_table[$_.ToLower()] = $_.ToLower()
 }
-Write-Verbose "Latest version: $latest"
 
-if ( $Version -EQ "latest") {
-    $Version = $latest
+Write-Verbose "Available versions:"
+$available_versions | ForEach-Object {
+    Write-Verbose "- $_"
 }
+Write-Verbose "Versions Table:"
+$versions_table | Sort-Object Name | Out-String | Write-Verbose
 
 #===============================================================================
 # Validate passed version
 #===============================================================================
-if ( $versions -notcontains $Version ) {
+if ( $versions_table -notcontains $Version.ToLower() ) {
     Write-Host "Version $Version is not available" -ForegroundColor Red
     Write-Host "Available versions are:" -ForegroundColor Yellow
-    $versions | ForEach-Object { Write-Host $_ -ForegroundColor Yellow }
+    $available_versions | ForEach-Object { Write-Host "- $_" -ForegroundColor Yellow }
     exit 1
+} else {
+    $Version = $versions_table[$Version.ToLower()]
 }
 
 #===============================================================================

tests/conftest.py

@@ -1,9 +1,12 @@
-import logging
+import json
 import os
 
 import pytest
+import requests
 
-log = logging.getLogger(__name__)
+API_URL = (
+    "https://packages.broadcom.com/artifactory/api/storage/saltproject-generic/windows"
+)
 
 
 @pytest.fixture(scope="session")
@@ -13,10 +16,26 @@ def target_python_version():
 
 @pytest.fixture(scope="session")
 def target_salt_version():
+
     target_salt = os.environ.get("SaltVersion", "")
 
+    html_response = requests.get(API_URL)
+    content = json.loads(html_response.text)
+    folders = content["children"]
+    versions = {}
+    for folder in folders:
+        if folder["folder"]:
+            version = folder["uri"].strip("/")
+            versions[version] = version
+            # We're trying to get the latest major version and latest overall
+            maj_version = version.split(".")[0]
+            versions[maj_version] = version
+            versions["latest"] = version
+
     if target_salt.startswith("v"):
         target_salt = target_salt[1:]
+    if target_salt not in versions:
+        pytest.skip(f"Invalid testing version: {target_salt}")
     if target_salt in ("default", "latest", "master", "nightly"):
         pytest.skip("Don't have a specific salt version to test against")
-    return target_salt
+    return versions[target_salt]

tests/requirements.txt

@@ -1 +1,2 @@
-pytest
+pytest
+requests