mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 02:00:22 +00:00
Merge pull request #1479 from bryceml/update_pipelines_for_new_release
update pipelines
This commit is contained in:
Pedro Algarvio
GitHub
commit
24b11bb6a4
3 changed files with 1054 additions and 1141 deletions
2116
.github/workflows/main.yml
vendored
2116
.github/workflows/main.yml
vendored
File diff suppressed because it is too large
Load diff
30
.github/workflows/templates/generate.py
vendored
30
.github/workflows/templates/generate.py
vendored
|
|
@ -20,7 +20,8 @@ LINUX_DISTROS = [
|
|||
'fedora-32',
|
||||
'opensuse-15',
|
||||
'ubuntu-1604',
|
||||
'ubuntu-1804'
|
||||
'ubuntu-1804',
|
||||
'ubuntu-2004',
|
||||
]
|
||||
OSX = WINDOWS = []
|
||||
|
||||
|
|
@ -35,8 +36,10 @@ STABLE_DISTROS = [
|
|||
'debian-9',
|
||||
'fedora-30',
|
||||
'fedora-31',
|
||||
'fedora-32',
|
||||
'ubuntu-1604',
|
||||
'ubuntu-1804',
|
||||
'ubuntu-2004',
|
||||
]
|
||||
|
||||
PY2_BLACKLIST = [
|
||||
|
|
@ -45,7 +48,8 @@ PY2_BLACKLIST = [
|
|||
'fedora-30',
|
||||
'fedora-31',
|
||||
'fedora-32',
|
||||
'opensuse-15'
|
||||
'opensuse-15',
|
||||
'ubuntu-2004',
|
||||
]
|
||||
|
||||
PY3_BLACKLIST = [
|
||||
|
|
@ -54,16 +58,18 @@ PY3_BLACKLIST = [
|
|||
'debian-8',
|
||||
]
|
||||
|
||||
BLACKLIST_2018 = [
|
||||
'amazon-2',
|
||||
'centos-8',
|
||||
'debian-10',
|
||||
BLACKLIST_2019 = [
|
||||
'ubuntu-2004',
|
||||
]
|
||||
|
||||
BLACKLIST_3000 = [
|
||||
'ubuntu-2004',
|
||||
]
|
||||
|
||||
SALT_BRANCHES = [
|
||||
'2018-3',
|
||||
'2019-2',
|
||||
'3000',
|
||||
'3001',
|
||||
'master',
|
||||
'latest'
|
||||
]
|
||||
|
|
@ -75,9 +81,9 @@ SALT_POST_3000_BLACKLIST = [
|
|||
]
|
||||
|
||||
BRANCH_DISPLAY_NAMES = {
|
||||
'2018-3': 'v2018.3',
|
||||
'2019-2': 'v2019.2',
|
||||
'3000': 'v3000',
|
||||
'3001': 'v3001',
|
||||
'master': 'Master',
|
||||
'latest': 'Latest'
|
||||
}
|
||||
|
|
@ -104,7 +110,8 @@ DISTRO_DISPLAY_NAMES = {
|
|||
'fedora-32': 'Fedora 32',
|
||||
'opensuse-15': 'Opensuse 15',
|
||||
'ubuntu-1604': 'Ubuntu 16.04',
|
||||
'ubuntu-1804': 'Ubuntu 18.04'
|
||||
'ubuntu-1804': 'Ubuntu 18.04',
|
||||
'ubuntu-2004': 'Ubuntu 20.04',
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -190,7 +197,10 @@ def generate_test_jobs():
|
|||
if branch not in allowed_branches:
|
||||
# Arch and Fedora default to py3.8
|
||||
continue
|
||||
if branch == '2018-3' and distro in BLACKLIST_2018:
|
||||
if branch == '2019-2' and distro in BLACKLIST_2019:
|
||||
continue
|
||||
|
||||
if branch == '3000' and distro in BLACKLIST_3000:
|
||||
continue
|
||||
|
||||
if python_version == 'py2' and distro in PY2_BLACKLIST:
|
||||
|
|
|
|||
49
.kitchen.yml
49
.kitchen.yml
|
|
@ -103,6 +103,9 @@ platforms:
|
|||
- systemctl enable sshd.service
|
||||
provisioner:
|
||||
salt_bootstrap_options: -MPfq -y -x python2 git %s
|
||||
- name: ubuntu-20.04
|
||||
driver_config:
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-18.04
|
||||
driver_config:
|
||||
run_command: /lib/systemd/systemd
|
||||
|
|
@ -111,9 +114,6 @@ platforms:
|
|||
run_command: /lib/systemd/systemd
|
||||
|
||||
suites:
|
||||
- name: py2-git-2018-3
|
||||
provisioner:
|
||||
salt_version: 2018.3
|
||||
- name: py2-git-2019-2
|
||||
provisioner:
|
||||
salt_version: 2019.2
|
||||
|
|
@ -123,16 +123,6 @@ suites:
|
|||
- name: py2-git-master
|
||||
provisioner:
|
||||
salt_version: master
|
||||
- name: py2-stable-2018-3
|
||||
provisioner:
|
||||
salt_version: 2018.3
|
||||
salt_bootstrap_options: -MP stable %s
|
||||
excludes:
|
||||
- arch
|
||||
- opensuse-15
|
||||
- fedora-30
|
||||
- fedora-31
|
||||
- fedora-32
|
||||
- name: py2-stable-2019-2
|
||||
provisioner:
|
||||
salt_version: 2019.2
|
||||
|
|
@ -143,6 +133,7 @@ suites:
|
|||
- fedora-30
|
||||
- fedora-31
|
||||
- fedora-32
|
||||
- ubuntu-2004
|
||||
- name: py2-stable-3000
|
||||
provisioner:
|
||||
salt_version: 3000
|
||||
|
|
@ -153,16 +144,8 @@ suites:
|
|||
- fedora-30
|
||||
- fedora-31
|
||||
- fedora-32
|
||||
- ubuntu-2004
|
||||
|
||||
- name: py3-git-2018-3
|
||||
provisioner:
|
||||
salt_version: 2018.3
|
||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
||||
excludes:
|
||||
- amazon-1
|
||||
- centos-6
|
||||
- debian-8
|
||||
- amazon-2
|
||||
- name: py3-git-3000
|
||||
provisioner:
|
||||
salt_version: 3000
|
||||
|
|
@ -171,6 +154,7 @@ suites:
|
|||
- amazon-1
|
||||
- centos-6
|
||||
- debian-8
|
||||
- ubuntu-2004
|
||||
- name: py3-git-2019-2
|
||||
provisioner:
|
||||
salt_version: 2019.2
|
||||
|
|
@ -179,16 +163,15 @@ suites:
|
|||
- amazon-1
|
||||
- centos-6
|
||||
- debian-8
|
||||
- name: py3-stable-2018-3
|
||||
- ubuntu-2004
|
||||
- name: py3-git-3001
|
||||
provisioner:
|
||||
salt_version: 2018.3
|
||||
salt_bootstrap_options: -x python3 -MP stable %s
|
||||
salt_version: 3001
|
||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
||||
excludes:
|
||||
- amazon-1
|
||||
- centos-6
|
||||
- debian-8
|
||||
- opensuse-15
|
||||
- amazon-2
|
||||
- name: py3-stable-2019-2
|
||||
provisioner:
|
||||
salt_version: 2019.2
|
||||
|
|
@ -199,6 +182,7 @@ suites:
|
|||
- debian-8
|
||||
- opensuse-15
|
||||
- arch
|
||||
- ubuntu-2004
|
||||
- name: py3-stable-3000
|
||||
provisioner:
|
||||
salt_version: 3000
|
||||
|
|
@ -209,6 +193,17 @@ suites:
|
|||
- debian-8
|
||||
- opensuse-15
|
||||
- arch
|
||||
- ubuntu-2004
|
||||
- name: py3-stable-3001
|
||||
provisioner:
|
||||
salt_version: 3001
|
||||
salt_bootstrap_options: -x python3 -MP stable %s
|
||||
excludes:
|
||||
- amazon-1
|
||||
- centos-6
|
||||
- debian-8
|
||||
- opensuse-15
|
||||
- arch
|
||||
- name: py3-git-master
|
||||
provisioner:
|
||||
salt_version: master
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue