saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Test out the minor versions (#1936)

Browse source 
* Test out the minor versions

* update the maxsplit for the target_salt_version to account for minor versions passed in with dashes because kitchen does not like dots.

* Blacklist 3005-1 and 3006-1 for git.

* different approach to getting the target salt version

* Adding missing kitchen files.
This commit is contained in:
Gareth J. Greenaway 2023-06-26 15:48:10 -07:00 • committed by GitHub
parent 7867723e2f
commit 4fefc1cbed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 84 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
.github/workflows/ci.yml vendored
View file

@ -173,7 +173,7 @@ jobs:
display-name: macOS 11 display-name: macOS 11
timeout: 20 timeout: 20
runs-on: macos-11 runs-on: macos-11
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "latest"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "stable-3006-1", "latest"]'
macos-12: macos-12:
@ -188,7 +188,7 @@ jobs:
display-name: macOS 12 display-name: macOS 12
timeout: 20 timeout: 20
runs-on: macos-12 runs-on: macos-12
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "latest"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3006", "stable-3006-1", "latest"]'
@ -204,7 +204,7 @@ jobs:
display-name: Windows 2019 display-name: Windows 2019
timeout: 20 timeout: 20
runs-on: windows-2019 runs-on: windows-2019
instances: '["stable-3005", "stable-3006", "latest"]' instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
windows-2022: windows-2022:
@ -219,7 +219,7 @@ jobs:
display-name: Windows 2022 display-name: Windows 2022
timeout: 20 timeout: 20
runs-on: windows-2022 runs-on: windows-2022
instances: '["stable-3005", "stable-3006", "latest"]' instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
@ -234,7 +234,7 @@ jobs:
distro-slug: almalinux-8 distro-slug: almalinux-8
display-name: AlmaLinux 8 display-name: AlmaLinux 8
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
almalinux-9: almalinux-9:
@ -248,7 +248,7 @@ jobs:
distro-slug: almalinux-9 distro-slug: almalinux-9
display-name: AlmaLinux 9 display-name: AlmaLinux 9
timeout: 20 timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
amazon-2: amazon-2:
@ -262,7 +262,7 @@ jobs:
distro-slug: amazon-2 distro-slug: amazon-2
display-name: Amazon 2 display-name: Amazon 2
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
arch: arch:
@ -290,7 +290,7 @@ jobs:
distro-slug: centos-7 distro-slug: centos-7
display-name: CentOS 7 display-name: CentOS 7
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
centos-stream8: centos-stream8:
@ -304,7 +304,7 @@ jobs:
distro-slug: centos-stream8 distro-slug: centos-stream8
display-name: CentOS Stream 8 display-name: CentOS Stream 8
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
centos-stream9: centos-stream9:
@ -318,7 +318,7 @@ jobs:
distro-slug: centos-stream9 distro-slug: centos-stream9
display-name: CentOS Stream 9 display-name: CentOS Stream 9
timeout: 20 timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
debian-10: debian-10:
@ -332,7 +332,7 @@ jobs:
distro-slug: debian-10 distro-slug: debian-10
display-name: Debian 10 display-name: Debian 10
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
debian-11: debian-11:
@ -346,7 +346,7 @@ jobs:
distro-slug: debian-11 distro-slug: debian-11
display-name: Debian 11 display-name: Debian 11
timeout: 20 timeout: 20
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
fedora-36: fedora-36:
@ -360,7 +360,7 @@ jobs:
distro-slug: fedora-36 distro-slug: fedora-36
display-name: Fedora 36 display-name: Fedora 36
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
fedora-37: fedora-37:
@ -374,7 +374,7 @@ jobs:
distro-slug: fedora-37 distro-slug: fedora-37
display-name: Fedora 37 display-name: Fedora 37
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
fedora-38: fedora-38:
@ -388,7 +388,7 @@ jobs:
distro-slug: fedora-38 distro-slug: fedora-38
display-name: Fedora 38 display-name: Fedora 38
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
gentoo: gentoo:
@ -458,7 +458,7 @@ jobs:
distro-slug: oraclelinux-7 distro-slug: oraclelinux-7
display-name: Oracle Linux 7 display-name: Oracle Linux 7
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
oraclelinux-8: oraclelinux-8:
@ -472,7 +472,7 @@ jobs:
distro-slug: oraclelinux-8 distro-slug: oraclelinux-8
display-name: Oracle Linux 8 display-name: Oracle Linux 8
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
photon-3: photon-3:
@ -486,7 +486,7 @@ jobs:
distro-slug: photon-3 distro-slug: photon-3
display-name: Photon OS 3 display-name: Photon OS 3
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
photon-4: photon-4:
@ -500,7 +500,7 @@ jobs:
distro-slug: photon-4 distro-slug: photon-4
display-name: Photon OS 4 display-name: Photon OS 4
timeout: 20 timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
rockylinux-8: rockylinux-8:
@ -514,7 +514,7 @@ jobs:
distro-slug: rockylinux-8 distro-slug: rockylinux-8
display-name: Rocky Linux 8 display-name: Rocky Linux 8
timeout: 20 timeout: 20
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]' instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
rockylinux-9: rockylinux-9:
@ -528,7 +528,7 @@ jobs:
distro-slug: rockylinux-9 distro-slug: rockylinux-9
display-name: Rocky Linux 9 display-name: Rocky Linux 9
timeout: 20 timeout: 20
instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["git-3005", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
ubuntu-2004: ubuntu-2004:
@ -542,7 +542,7 @@ jobs:
distro-slug: ubuntu-2004 distro-slug: ubuntu-2004
display-name: Ubuntu 20.04 display-name: Ubuntu 20.04
timeout: 20 timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
ubuntu-2204: ubuntu-2204:
@ -556,7 +556,7 @@ jobs:
distro-slug: ubuntu-2204 distro-slug: ubuntu-2204
display-name: Ubuntu 22.04 display-name: Ubuntu 22.04
timeout: 20 timeout: 20
instances: '["stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]' instances: '["stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
set-pipeline-exit-status: set-pipeline-exit-status:

16
.github/workflows/templates/generate.py vendored
View file

@ -282,7 +282,9 @@ SALT_VERSIONS = [
"3003", "3003",
"3004", "3004",
"3005", "3005",
"3005-1",
"3006", "3006",
"3006-1",
"master", "master",
"latest", "latest",
"nightly", "nightly",
@ -300,14 +302,18 @@ VERSION_DISPLAY_NAMES = {
"3003": "v3003", "3003": "v3003",
"3004": "v3004", "3004": "v3004",
"3005": "v3005", "3005": "v3005",
"3005-1": "v3005.1",
"3006": "v3006", "3006": "v3006",
"3006-1": "v3006.1",
"master": "Master", "master": "Master",
"latest": "Latest", "latest": "Latest",
"nightly": "Nightly", "nightly": "Nightly",
} }
OLD_STABLE_VERSION_BLACKLIST = [ OLD_STABLE_VERSION_BLACKLIST = [
"3005-1",
"3006", "3006",
"3006-1",
"master", "master",
"nightly", "nightly",
] ]
@ -320,7 +326,9 @@ STABLE_VERSION_BLACKLIST = [
] ]
MAC_OLD_STABLE_VERSION_BLACKLIST = [ MAC_OLD_STABLE_VERSION_BLACKLIST = [
"3005-1",
"3006", "3006",
"3006-1",
"master", "master",
"nightly", "nightly",
] ]
@ -329,11 +337,14 @@ MAC_STABLE_VERSION_BLACKLIST = [
"3003", "3003",
"3004", "3004",
"3005", "3005",
"3005-1",
"master", "master",
"nightly", "nightly",
] ]
GIT_VERSION_BLACKLIST = [ GIT_VERSION_BLACKLIST = [
"3005-1",
"3006-1",
"nightly", "nightly",
] ]
@ -660,7 +671,9 @@ def generate_test_jobs():
"3003": BLACKLIST_3003, "3003": BLACKLIST_3003,
"3004": BLACKLIST_3004, "3004": BLACKLIST_3004,
"3005": BLACKLIST_3005, "3005": BLACKLIST_3005,
"3005-1": BLACKLIST_3005,
"3006": BLACKLIST_3006, "3006": BLACKLIST_3006,
"3006-1": BLACKLIST_3006,
} }
if bootstrap_type == "git": if bootstrap_type == "git":
BLACKLIST = { BLACKLIST = {
@ -678,7 +691,8 @@ def generate_test_jobs():
continue continue
if ( if (
salt_version in ("3003", "3004", "3005", "3006", "master") salt_version
in ("3003", "3004", "3005", "3005-1", "3006", "3006-1", "master")
and distro in BLACKLIST[salt_version] and distro in BLACKLIST[salt_version]
): ):
continue continue

4
kitchen.macos.yml
View file

@ -37,6 +37,10 @@ suites:
provisioner: provisioner:
salt_version: 3006 salt_version: 3006
salt_call_command: /opt/salt/salt-call salt_call_command: /opt/salt/salt-call
- name: stable-3006-1
provisioner:
salt_version: 3006.1
salt_call_command: /opt/salt/salt-call
- name: latest - name: latest
provisioner: provisioner:
salt_version: latest salt_version: latest

7
kitchen.windows.yml
View file

@ -28,10 +28,17 @@ suites:
- name: stable-3005 - name: stable-3005
provisioner: provisioner:
salt_version: 3005.1-1 salt_version: 3005.1-1
- name: stable-3005-1
provisioner:
salt_version: 3005.1-1
- name: stable-3006 - name: stable-3006
provisioner: provisioner:
salt_version: 3006.0 salt_version: 3006.0
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe
- name: stable-3006-1
provisioner:
salt_version: 3006.1
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe
- name: latest - name: latest
provisioner: provisioner:
salt_version: latest salt_version: latest

22
kitchen.yml
View file

@ -301,6 +301,17 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - openbsd-6
- name: stable-3005-1
provisioner:
salt_version: 3005.1
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: stable-3006 - name: stable-3006
provisioner: provisioner:
salt_version: 3006 salt_version: 3006
@ -312,6 +323,17 @@ suites:
- freebsd-131 - freebsd-131
- freebsd-123 - freebsd-123
- openbsd-6 - openbsd-6
- name: stable-3006-1
provisioner:
salt_version: 3006.1
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-tumbleweed
- arch
- freebsd-131
- freebsd-123
- openbsd-6
- name: git-master - name: git-master
provisioner: provisioner:
salt_version: master salt_version: master

14
tests/conftest.py
View file

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