Skip to content
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

Fixes for 3006 #1912

Merged
merged 20 commits into from
Apr 21, 2023
Merged

Fixes for 3006 #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
90cc157
Adding 3006 to tests.
garethgreenaway Apr 18, 2023
27eef7d
Update to MacOS latest install. Need to install procps on onedir cen…
garethgreenaway Apr 19, 2023
ef70886
removing check for different GPG keys for latest & nightly now that 3…
garethgreenaway Apr 19, 2023
717db99
Adding 3006.0 to kitchen.windows.yml and kitchen.macos.yml
garethgreenaway Apr 19, 2023
1367b09
couple places that 3006 is needed for git installs.
garethgreenaway Apr 19, 2023
e1fd498
updating kitchen.yml with 3006.
garethgreenaway Apr 19, 2023
d8a7e90
fixing 3006 tag name
garethgreenaway Apr 19, 2023
6dbae5e
fixing version for git-3006.
garethgreenaway Apr 19, 2023
142eb80
removing check for whether to use the new GPG key.
garethgreenaway Apr 19, 2023
f823932
Some fixes for MacOS.
garethgreenaway Apr 19, 2023
a3fed78
More MacOS fixes.
garethgreenaway Apr 19, 2023
a8b32ab
Fixing bootstrap and CICD to install via tag only if version begins w…
garethgreenaway Apr 20, 2023
719422a
fixing kitchen.yml for git installs.
garethgreenaway Apr 20, 2023
e7c8f76
If the passed version begins with v, eg. it's a tag, remove it before…
garethgreenaway Apr 20, 2023
c2c6bd1
revert GIT_VERSIONS code.
garethgreenaway Apr 20, 2023
d9a8f4a
Fixing kitchen.yml file.
garethgreenaway Apr 20, 2023
8d02826
account for salt_version ending in .x, eg. 3006.x branch.
garethgreenaway Apr 20, 2023
7825da5
Revert to installing 3006 from the tag but blacklist any distribution…
garethgreenaway Apr 21, 2023
3c8b08c
removing nightly from onedir until S3 buckets are fixed.
garethgreenaway Apr 21, 2023
3d29c38
merging upstream
garethgreenaway Apr 21, 2023
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
42 changes: 21 additions & 21 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ jobs:
distro-slug: almalinux-8
display-name: AlmaLinux 8
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'


almalinux-9:
Expand All @@ -263,7 +263,7 @@ jobs:
distro-slug: almalinux-9
display-name: AlmaLinux 9
timeout: 20
instances: '["git-3005", "onedir-3005", "git-3006", "git-master", "onedir-nightly"]'
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'


amazon-2:
Expand All @@ -277,7 +277,7 @@ jobs:
distro-slug: amazon-2
display-name: Amazon 2
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'


arch:
Expand All @@ -291,7 +291,7 @@ jobs:
distro-slug: arch
display-name: Arch
timeout: 20
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
instances: '["git-master", "latest"]'


centos-7:
Expand All @@ -305,7 +305,7 @@ jobs:
distro-slug: centos-7
display-name: CentOS 7
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'


centos-stream8:
Expand All @@ -319,7 +319,7 @@ jobs:
distro-slug: centos-stream8
display-name: CentOS Stream 8
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'


centos-stream9:
Expand All @@ -333,7 +333,7 @@ jobs:
distro-slug: centos-stream9
display-name: CentOS Stream 9
timeout: 20
instances: '["git-3005", "onedir-3005", "git-3006", "git-master", "onedir-nightly"]'
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'


debian-10:
Expand All @@ -347,7 +347,7 @@ jobs:
distro-slug: debian-10
display-name: Debian 10
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'


debian-11:
Expand All @@ -361,7 +361,7 @@ jobs:
distro-slug: debian-11
display-name: Debian 11
timeout: 20
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'


fedora-35:
Expand All @@ -375,7 +375,7 @@ jobs:
distro-slug: fedora-35
display-name: Fedora 35
timeout: 20
instances: '["git-3006", "git-master", "latest"]'
instances: '["git-master", "latest"]'


fedora-36:
Expand All @@ -389,7 +389,7 @@ jobs:
distro-slug: fedora-36
display-name: Fedora 36
timeout: 20
instances: '["git-3006", "git-master", "latest"]'
instances: '["git-master", "latest"]'


fedora-37:
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:
distro-slug: gentoo
display-name: Gentoo
timeout: 90
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
instances: '["git-master", "latest"]'


gentoo-systemd:
Expand All @@ -445,7 +445,7 @@ jobs:
distro-slug: gentoo-systemd
display-name: Gentoo (systemd)
timeout: 90
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
instances: '["git-master", "latest"]'


opensuse-15:
Expand All @@ -459,7 +459,7 @@ jobs:
distro-slug: opensuse-15
display-name: Opensuse 15
timeout: 20
instances: '["stable-3006", "latest"]'
instances: '["latest"]'


opensuse-tumbleweed:
Expand All @@ -473,7 +473,7 @@ jobs:
distro-slug: opensuse-tumbleweed
display-name: Opensuse Tumbleweed
timeout: 20
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
instances: '["git-master", "latest"]'


oraclelinux-7:
Expand All @@ -487,7 +487,7 @@ jobs:
distro-slug: oraclelinux-7
display-name: Oracle Linux 7
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'


oraclelinux-8:
Expand All @@ -501,7 +501,7 @@ jobs:
distro-slug: oraclelinux-8
display-name: Oracle Linux 8
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'


rockylinux-8:
Expand All @@ -515,7 +515,7 @@ jobs:
distro-slug: rockylinux-8
display-name: Rocky Linux 8
timeout: 20
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'


rockylinux-9:
Expand All @@ -529,7 +529,7 @@ jobs:
distro-slug: rockylinux-9
display-name: Rocky Linux 9
timeout: 20
instances: '["git-3005", "onedir-3005", "git-3006", "git-master", "onedir-nightly"]'
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'


ubuntu-2004:
Expand All @@ -543,7 +543,7 @@ jobs:
distro-slug: ubuntu-2004
display-name: Ubuntu 20.04
timeout: 20
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'


ubuntu-2204:
Expand All @@ -557,7 +557,7 @@ jobs:
distro-slug: ubuntu-2204
display-name: Ubuntu 22.04
timeout: 20
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'


set-pipeline-exit-status:
Expand Down
43 changes: 37 additions & 6 deletions .github/workflows/templates/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,39 @@
"ubuntu-2204",
]

BLACKLIST_3006 = [
"arch",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
]

BLACKLIST_GIT_3006 = [
"almalinux-9",
"amazon-2",
"arch",
"centos-stream9",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"rockylinux-9",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
]

SALT_VERSIONS = [
"3003",
"3004",
Expand All @@ -222,8 +255,8 @@

ONEDIR_SALT_VERSIONS = [
"3005",
"3006",
"latest",
"nightly",
]

ONEDIR_RC_SALT_VERSIONS = []
Expand All @@ -241,14 +274,10 @@
STABLE_VERSION_BLACKLIST = [
"master",
"nightly",
"3006-0rc1",
"3006-0rc2",
]

GIT_VERSION_BLACKLIST = [
"nightly",
"3006-0rc1",
"3006-0rc2",
]

# TODO: Revert the commit relating to this section, once the Git-based builds
Expand Down Expand Up @@ -551,12 +580,14 @@ def generate_test_jobs():
"3003": BLACKLIST_3003,
"3004": BLACKLIST_3004,
"3005": BLACKLIST_3005,
"3006": BLACKLIST_3006,
}
if bootstrap_type == "git":
BLACKLIST = {
"3003": BLACKLIST_GIT_3003,
"3004": BLACKLIST_GIT_3004,
"3005": BLACKLIST_GIT_3005,
"3006": BLACKLIST_GIT_3006,
}

# .0 versions are a virtual version for pinning to the first
Expand All @@ -566,7 +597,7 @@ def generate_test_jobs():
continue

if (
salt_version in ("3003", "3004", "3005")
salt_version in ("3003", "3004", "3005", "3006")
and distro in BLACKLIST[salt_version]
):
continue
Expand Down
Loading