Skip to content

fix(bootstrap): support Salt 3008+ major versions and fix repo/key issues #2120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
twangboy wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(bootstrap): support Salt 3008+ major versions and fix repo/key issues #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6ecb32
fix(bootstrap): support Salt 3008+ major versions and fix repo/key is…
twangboy Jun 26, 2026
579eeea
ci: add Salt 3008 and Ubuntu 26.04 to test matrix
twangboy Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
container-slug: macos-14
timeout: 20
runs-on: macos-14
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "stable-3008", "latest"]'


macos-15-intel:
Expand All @@ -143,7 +143,7 @@ jobs:
container-slug: macos-15-intel
timeout: 20
runs-on: macos-15-intel
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "stable-3008", "latest"]'



Expand All @@ -160,7 +160,7 @@ jobs:
container-slug: windows-2022
timeout: 20
runs-on: windows-2022
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "stable-3008", "latest"]'


windows-2025:
Expand All @@ -176,7 +176,7 @@ jobs:
container-slug: windows-2025
timeout: 20
runs-on: windows-2025
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "stable-3008", "latest"]'



Expand All @@ -192,7 +192,7 @@ jobs:
display-name: Amazon 2023
container-slug: amazonlinux-2023
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "latest", "default"]'


debian-11:
Expand All @@ -207,7 +207,7 @@ jobs:
display-name: Debian 11
container-slug: debian-11
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]'


debian-12:
Expand All @@ -222,7 +222,7 @@ jobs:
display-name: Debian 12
container-slug: debian-12
timeout: 20
instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]'


photon-5:
Expand All @@ -237,7 +237,7 @@ jobs:
display-name: Photon OS 5
container-slug: photon-5
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "latest", "default"]'


rockylinux-8:
Expand All @@ -252,7 +252,7 @@ jobs:
display-name: Rocky Linux 8
container-slug: rockylinux-8
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "onedir-3008", "latest", "default"]'


rockylinux-9:
Expand All @@ -267,7 +267,7 @@ jobs:
display-name: Rocky Linux 9
container-slug: rockylinux-9
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "latest", "default"]'


ubuntu-2204:
Expand All @@ -282,7 +282,22 @@ jobs:
display-name: Ubuntu 22.04
container-slug: ubuntu-22.04
timeout: 20
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]'


ubuntu-2604:
name: Ubuntu 26.04
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: ubuntu-2604
display-name: Ubuntu 26.04
container-slug: ubuntu-26.04
timeout: 20
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]'


set-pipeline-exit-status:
Expand All @@ -304,6 +319,7 @@ jobs:
- rockylinux-8
- rockylinux-9
- ubuntu-2204
- ubuntu-2604
if: always()
steps:

Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/templates/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"rockylinux-8",
"rockylinux-9",
"ubuntu-2204",
"ubuntu-2604",
]

WINDOWS = [
Expand All @@ -49,6 +50,7 @@
"rockylinux-8",
"rockylinux-9",
"ubuntu-2204",
"ubuntu-2604",
]

# "amazonlinux-2",
Expand All @@ -65,6 +67,7 @@
"rockylinux-8",
"rockylinux-9",
"ubuntu-2204",
"ubuntu-2604",
]

# "amazonlinux-2",
Expand All @@ -78,6 +81,7 @@
"photon-5",
"rockylinux-9",
"ubuntu-2204",
"ubuntu-2604",
]

BLACKLIST_3006 = [
Expand All @@ -91,6 +95,8 @@
"photon-4",
]

BLACKLIST_3008 = []

# "ubuntu-2204",
BLACKLIST_GIT_3006 = [
"amazonlinux-2",
Expand Down Expand Up @@ -137,6 +143,7 @@
"3006-8",
"3007",
"3007-1",
"3008",
"master",
"latest",
"nightly",
Expand All @@ -145,6 +152,7 @@
ONEDIR_SALT_VERSIONS = [
"3006",
"3007",
"3008",
"latest",
]

Expand All @@ -155,6 +163,7 @@
"3006-8": "v3006.8",
"3007": "v3007",
"3007-1": "v3007.1",
"3008": "v3008",
"master": "Master",
"latest": "Latest",
"nightly": "Nightly",
Expand Down Expand Up @@ -205,6 +214,7 @@
"ubuntu-2004": "Ubuntu 20.04",
"ubuntu-2204": "Ubuntu 22.04",
"ubuntu-2404": "Ubuntu 24.04",
"ubuntu-2604": "Ubuntu 26.04",
"macos-14": "macOS 14",
"macos-15-intel": "macOS 15 (intel)",
"windows-2022": "Windows 2022",
Expand All @@ -225,6 +235,7 @@
"ubuntu-2004": "ubuntu-20.04",
"ubuntu-2204": "ubuntu-22.04",
"ubuntu-2404": "ubuntu-24.04",
"ubuntu-2604": "ubuntu-26.04",
"macos-14": "macos-14",
"macos-15-intel": "macos-15-intel",
"windows-2022": "windows-2022",
Expand Down Expand Up @@ -405,6 +416,7 @@ def generate_test_jobs():
"3006-8": BLACKLIST_3006,
"3007": BLACKLIST_3007,
"3007-1": BLACKLIST_3007,
"3008": BLACKLIST_3008,
}
if bootstrap_type == "git":
BLACKLIST = {
Expand All @@ -419,10 +431,7 @@ def generate_test_jobs():
if salt_version.endswith("-0"):
continue

if (
salt_version in ("3006", "3006-8", "3007", "3007-1", "master")
and distro in BLACKLIST[salt_version]
):
if distro in BLACKLIST.get(salt_version, []):
continue

test_target = f"{bootstrap_type}-{salt_version}"
Expand Down
Loading
Loading