update tested oses

This commit is contained in:
Bryce Larson 2020-12-07 23:27:37 +00:00 committed by Pedro Algarvio
parent 5fe4b06b6c
commit b8a6066350
3 changed files with 1746 additions and 674 deletions

File diff suppressed because it is too large Load diff

View file

@ -9,15 +9,12 @@ LINUX_DISTROS = [
# 'amazon-1',
'amazon-2',
'arch',
'centos-6',
'centos-7',
'centos-8',
'debian-10',
'debian-8',
'debian-9',
'fedora-30',
'fedora-31',
'fedora-32',
'fedora-33',
'gentoo',
'gentoo-systemd',
'opensuse-15',
@ -30,15 +27,12 @@ OSX = WINDOWS = []
STABLE_DISTROS = [
'amazon-1',
'amazon-2',
'centos-6',
'centos-7',
'centos-8',
'debian-10',
'debian-8',
'debian-9',
'fedora-30',
'fedora-31',
'fedora-32',
'fedora-33',
'gentoo',
'gentoo-systemd',
'ubuntu-1604',
@ -49,9 +43,8 @@ STABLE_DISTROS = [
PY2_BLACKLIST = [
'centos-8',
'debian-10',
'fedora-30',
'fedora-31',
'fedora-32',
'fedora-33',
'gentoo',
'gentoo-systemd',
'opensuse-15',
@ -60,15 +53,15 @@ PY2_BLACKLIST = [
PY3_BLACKLIST = [
'amazon-1',
'centos-6',
'debian-8',
]
BLACKLIST_2019 = [
'fedora-33',
'ubuntu-2004',
]
BLACKLIST_3000 = [
'fedora-33',
'ubuntu-2004',
]
@ -77,21 +70,19 @@ SALT_BRANCHES = [
'3000',
'3001',
'3001-0',
'3002',
'3002-0',
'master',
'latest'
]
SALT_POST_3000_BLACKLIST = [
'centos-6',
'debian-8',
'fedora-30',
]
BRANCH_DISPLAY_NAMES = {
'2019-2': 'v2019.2',
'3000': 'v3000',
'3001': 'v3001',
'3001-0': 'v3001.0',
'3002': 'v3002',
'3002-0': 'v3002.0',
'master': 'Master',
'latest': 'Latest'
}
@ -107,15 +98,12 @@ DISTRO_DISPLAY_NAMES = {
'amazon-1': 'Amazon 1',
'amazon-2': 'Amazon 2',
'arch': 'Arch',
'centos-6': 'CentOS 6',
'centos-7': 'CentOS 7',
'centos-8': 'CentOS 8',
'debian-10': 'Debian 10',
'debian-8': 'Debian 8',
'debian-9': 'Debian 9',
'fedora-30': 'Fedora 30',
'fedora-31': 'Fedora 31',
'fedora-32': 'Fedora 32',
'fedora-33': 'Fedora 33',
'gentoo': 'Gentoo',
'gentoo-systemd': 'Gentoo (systemd)',
'opensuse-15': 'Opensuse 15',
@ -138,14 +126,6 @@ def generate_test_jobs():
for branch in SALT_BRANCHES:
if branch == 'master' and distro in SALT_POST_3000_BLACKLIST:
continue
try:
if int(branch) >= 3000 and distro in SALT_POST_3000_BLACKLIST:
continue
except ValueError:
pass
if branch == 'latest':
if distro in LATEST_PKG_BLACKLIST:
continue

View file

@ -57,42 +57,25 @@ platforms:
- name: centos-7
driver_config:
run_command: /usr/lib/systemd/systemd
- name: centos-6
driver_config:
run_command: /sbin/init
provision_command:
- yum install -y upstart
provisioner:
salt_bootstrap_options: -MPfq -y -x python2.7 git %s
- name: debian-8
driver_config:
run_command: /lib/systemd/systemd
provision_command:
- apt-get install -y dbus
- name: debian-9
driver_config:
run_command: /lib/systemd/systemd
- name: debian-10
driver_config:
run_command: /lib/systemd/systemd
- name: fedora-30
driver_config:
image: fedora:30
run_command: /usr/lib/systemd/systemd
provision_command:
- dnf -y install procps-ng
- name: fedora-31
driver_config:
image: fedora:31
run_command: /usr/lib/systemd/systemd
provision_command:
- dnf -y install procps-ng
- name: fedora-32
driver_config:
image: fedora:32
run_command: /usr/lib/systemd/systemd
provision_command:
- dnf -y install procps-ng
- name: fedora-33
driver_config:
image: fedora:33
run_command: /usr/lib/systemd/systemd
provision_command:
- dnf -y install procps-ng
- sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
- name: gentoo
driver_config:
image: gentoo/stage3:latest
@ -151,9 +134,8 @@ suites:
excludes:
- arch
- opensuse-15
- fedora-30
- fedora-31
- fedora-32
- fedora-33
- gentoo
- gentoo-systemd
- ubuntu-2004
@ -164,9 +146,8 @@ suites:
excludes:
- arch
- opensuse-15
- fedora-30
- fedora-31
- fedora-32
- fedora-33
- gentoo
- gentoo-systemd
- ubuntu-2004
@ -177,8 +158,6 @@ suites:
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- amazon-1
- centos-6
- debian-8
- ubuntu-2004
- name: py3-git-2019-2
provisioner:
@ -186,8 +165,6 @@ suites:
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- amazon-1
- centos-6
- debian-8
- ubuntu-2004
- name: py3-git-3001
provisioner:
@ -195,16 +172,18 @@ suites:
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- amazon-1
- centos-6
- debian-8
- name: py3-git-3002
provisioner:
salt_version: 3002
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- amazon-1
- name: py3-stable-2019-2
provisioner:
salt_version: 2019.2
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- amazon-1
- centos-6
- debian-8
- opensuse-15
- arch
- ubuntu-2004
@ -214,8 +193,6 @@ suites:
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- amazon-1
- centos-6
- debian-8
- opensuse-15
- arch
- ubuntu-2004
@ -225,12 +202,9 @@ suites:
salt_bootstrap_options: -x python3 -MP stable 3001.0
excludes:
- amazon-1
- centos-6
- debian-8
- opensuse-15
- fedora-30
- fedora-31
- fedora-32
- fedora-33
- arch
- name: py3-stable-3001
provisioner:
@ -238,8 +212,24 @@ suites:
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- amazon-1
- centos-6
- debian-8
- opensuse-15
- arch
- name: py3-stable-3002-0
provisioner:
salt_version: 3002
salt_bootstrap_options: -x python3 -MP stable 3002.0
excludes:
- amazon-1
- opensuse-15
- fedora-32
- fedora-33
- arch
- name: py3-stable-3002
provisioner:
salt_version: 3002
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- amazon-1
- opensuse-15
- arch
- name: py3-git-master
@ -248,8 +238,6 @@ suites:
salt_bootstrap_options: -x python3 -MPfq -D git %s
excludes:
- amazon-1
- centos-6
- debian-8
- name: latest
provisioner: