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

Remove suse 42, fed28 and add fed31

Browse source
This commit is contained in:
ch3ll 2019-10-31 17:18:47 -04:00
parent 6363e8213a
commit e9e21a19a7
No known key found for this signature in database
GPG key ID: 1124C6796EBDBD8D
3 changed files with 192 additions and 328 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.drone.jsonnet
View file

@ -29,10 +29,9 @@ local distros = [
{ name: 'Debian 8', slug: 'debian-8', multiplier: 5, depends: [] }, { name: 'Debian 8', slug: 'debian-8', multiplier: 5, depends: [] },
{ name: 'Debian 9', slug: 'debian-9', multiplier: 6, depends: [] }, { name: 'Debian 9', slug: 'debian-9', multiplier: 6, depends: [] },
{ name: 'Debian 10', slug: 'debian-10', multiplier: 6, depends: [] }, { name: 'Debian 10', slug: 'debian-10', multiplier: 6, depends: [] },
{ name: 'Fedora 29', slug: 'fedora-29', multiplier: 5, depends: [] },
{ name: 'Fedora 30', slug: 'fedora-30', multiplier: 6, depends: [] }, { name: 'Fedora 30', slug: 'fedora-30', multiplier: 6, depends: [] },
{ name: 'Fedora 31', slug: 'fedora-31', multiplier: 6, depends: [] },
{ name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 4, depends: [] }, { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 4, depends: [] },
{ name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 3, depends: [] },
{ name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] }, { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] },
{ name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] }, { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] },
]; ];
@ -54,13 +53,18 @@ local py3_distros = [
'amazon-2', 'amazon-2',
'centos-7', 'centos-7',
'centos-8', 'centos-8',
'debian-8',
'debian-9', 'debian-9',
'debian-10', 'debian-10',
'ubuntu-1604', 'ubuntu-1604',
'ubuntu-1804', 'ubuntu-1804',
'fedora-30',
'fedora-31',
]; ];
local py2_blacklist = [
'centos-8',
'debian-10',
];
local Shellcheck() = { local Shellcheck() = {
kind: 'pipeline', kind: 'pipeline',
@ -85,7 +89,12 @@ local Build(distro) = {
project: 'open', project: 'open',
}, },
local suite = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, local suite =
if std.count(py2_blacklist, distro.slug) > 0 then
[]
else if std.count(stable_distros, distro.slug) > 0 then
git_suites + stable_suites
else git_suites,
local suites = suite + if std.count(py3_distros, distro.slug) > 0 then git_py3_suites + stable_py3_suites else [], local suites = suite + if std.count(py3_distros, distro.slug) > 0 then git_py3_suites + stable_py3_suites else [],
steps: [ steps: [

468
.drone.yml
View file

@ -326,7 +326,7 @@ steps:
- name: throttle-build - name: throttle-build
image: alpine image: alpine
commands: commands:
- sh -c 't=160; echo Sleeping 160 seconds; sleep 160' - sh -c 't=80; echo Sleeping 80 seconds; sleep 80'
- name: create - name: create
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
@ -341,58 +341,6 @@ steps:
depends_on: depends_on:
- throttle-build - throttle-build
- name: Py2 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2018-3-centos-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2019-2-centos-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-stable-2018-3-centos-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-stable-2019-2-centos-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Git) - name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
commands: commands:
@ -470,7 +418,7 @@ steps:
- name: throttle-build - name: throttle-build
image: alpine image: alpine
commands: commands:
- sh -c 't=200; echo Sleeping 200 seconds; sleep 200' - sh -c 't=100; echo Sleeping 100 seconds; sleep 100'
- name: create - name: create
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
@ -537,58 +485,6 @@ steps:
- throttle-build - throttle-build
- create - create
- name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-git-2018-3-debian-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-git-2019-2-debian-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-stable-2018-3-debian-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-stable-2019-2-debian-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services: services:
- name: docker - name: docker
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
@ -758,7 +654,7 @@ steps:
- name: throttle-build - name: throttle-build
image: alpine image: alpine
commands: commands:
- sh -c 't=240; echo Sleeping 240 seconds; sleep 240' - sh -c 't=120; echo Sleeping 120 seconds; sleep 120'
- name: create - name: create
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
@ -773,58 +669,6 @@ steps:
depends_on: depends_on:
- throttle-build - throttle-build
- name: Py2 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2018-3-debian-10
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2019-2-debian-10
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-stable-2018-3-debian-10
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-stable-2019-2-debian-10
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Git) - name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
commands: commands:
@ -890,72 +734,6 @@ node:
depends_on: depends_on:
- Lint - Lint
---
kind: pipeline
name: Fedora 29
platform:
os: linux
arch: amd64
steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=50; echo Sleeping 50 seconds; sleep 50'
- name: create
image: saltstack/drone-salt-bootstrap-testing
commands:
- bundle install --with docker --without opennebula ec2 windows vagrant
- echo 'Waiting for docker to start'
- sleep 10
- docker ps -a
- bundle exec kitchen create fedora-29
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- name: Py2 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2018-3-fedora-29
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2019-2-fedora-29
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
command:
- --storage-driver=overlay2
privileged: true
node:
project: open
depends_on:
- Lint
--- ---
kind: pipeline kind: pipeline
name: Fedora 30 name: Fedora 30
@ -968,7 +746,7 @@ steps:
- name: throttle-build - name: throttle-build
image: alpine image: alpine
commands: commands:
- sh -c 't=60; echo Sleeping 60 seconds; sleep 60' - sh -c 't=180; echo Sleeping 180 seconds; sleep 180'
- name: create - name: create
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
@ -1009,6 +787,176 @@ steps:
- throttle-build - throttle-build
- create - create
- name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-git-2018-3-fedora-30
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-git-2019-2-fedora-30
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-stable-2018-3-fedora-30
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-stable-2019-2-fedora-30
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
command:
- --storage-driver=overlay2
privileged: true
node:
project: open
depends_on:
- Lint
---
kind: pipeline
name: Fedora 31
platform:
os: linux
arch: amd64
steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=180; echo Sleeping 180 seconds; sleep 180'
- name: create
image: saltstack/drone-salt-bootstrap-testing
commands:
- bundle install --with docker --without opennebula ec2 windows vagrant
- echo 'Waiting for docker to start'
- sleep 10
- docker ps -a
- bundle exec kitchen create fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- name: Py2 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2018-3-fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2019-2-fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-git-2018-3-fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-git-2019-2-fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-stable-2018-3-fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py3-stable-2019-2-fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services: services:
- name: docker - name: docker
image: saltstack/drone-salt-bootstrap-testing image: saltstack/drone-salt-bootstrap-testing
@ -1088,72 +1036,6 @@ node:
depends_on: depends_on:
- Lint - Lint
---
kind: pipeline
name: Opensuse 42.3
platform:
os: linux
arch: amd64
steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=30; echo Sleeping 30 seconds; sleep 30'
- name: create
image: saltstack/drone-salt-bootstrap-testing
commands:
- bundle install --with docker --without opennebula ec2 windows vagrant
- echo 'Waiting for docker to start'
- sleep 10
- docker ps -a
- bundle exec kitchen create opensuse-42
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- name: Py2 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2018-3-opensuse-42
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
- pip install -U pip
- pip install -r tests/requirements.txt
- bundle install --with docker --without opennebula ec2 windows vagrant
- bundle exec kitchen test py2-git-2019-2-opensuse-42
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
command:
- --storage-driver=overlay2
privileged: true
node:
project: open
depends_on:
- Lint
--- ---
kind: pipeline kind: pipeline
name: Ubuntu 16.04 name: Ubuntu 16.04
@ -1444,6 +1326,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: aaf26c5b82aa9f009d383c3c5ab1f59bd306c74e38b5ea57f3482fbb62b98b31 hmac: 5e82d36d8b41c6fd2a9b5e3dd58f3ac5d0bece39053bee5041026a3488e3eb8e
... ...

35
.kitchen.yml
View file

@ -71,14 +71,14 @@ platforms:
- name: debian-10 - name: debian-10
driver_config: driver_config:
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: fedora-29
driver_config:
image: fedora:29
run_command: /usr/lib/systemd/systemd
- name: fedora-30 - name: fedora-30
driver_config: driver_config:
image: fedora:30 image: fedora:30
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
- name: fedora-31
driver_config:
image: fedora:31
run_command: /usr/lib/systemd/systemd
- name: opensuse-15 - name: opensuse-15
driver_config: driver_config:
image: opensuse/leap:15.0 image: opensuse/leap:15.0
@ -88,13 +88,6 @@ platforms:
- systemctl enable sshd.service - systemctl enable sshd.service
provisioner: provisioner:
salt_bootstrap_options: -MPfq -y -x python2 git %s salt_bootstrap_options: -MPfq -y -x python2 git %s
- name: opensuse-42
driver_config:
image: opensuse/leap:42.3
run_command: /usr/lib/systemd/systemd
provision_command:
- zypper --non-interactive install --auto-agree-with-licenses dbus-1
- systemctl enable sshd.service
- name: ubuntu-18.04 - name: ubuntu-18.04
driver_config: driver_config:
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
@ -118,22 +111,14 @@ suites:
salt_bootstrap_options: -MP stable %s salt_bootstrap_options: -MP stable %s
excludes: excludes:
- arch - arch
- fedora-28
- fedora-29
- fedora-30
- opensuse-15 - opensuse-15
- opensuse-42
- name: py2-stable-2019-2 - name: py2-stable-2019-2
provisioner: provisioner:
salt_version: 2019.2 salt_version: 2019.2
salt_bootstrap_options: -MP stable %s salt_bootstrap_options: -MP stable %s
excludes: excludes:
- arch - arch
- fedora-28
- fedora-29
- fedora-30
- opensuse-15 - opensuse-15
- opensuse-42
- name: py3-git-2018-3 - name: py3-git-2018-3
provisioner: provisioner:
salt_version: 2018.3 salt_version: 2018.3
@ -142,10 +127,7 @@ suites:
- amazon-1 - amazon-1
- centos-6 - centos-6
- debian-8 - debian-8
- fedora-29
- fedora-30
- opensuse-15 - opensuse-15
- opensuse-42
- name: py3-git-2019-2 - name: py3-git-2019-2
provisioner: provisioner:
salt_version: 2019.2 salt_version: 2019.2
@ -154,10 +136,7 @@ suites:
- amazon-1 - amazon-1
- centos-6 - centos-6
- debian-8 - debian-8
- fedora-29
- fedora-30
- opensuse-15 - opensuse-15
- opensuse-42
- name: py3-stable-2018-3 - name: py3-stable-2018-3
provisioner: provisioner:
salt_version: 2018.3 salt_version: 2018.3
@ -166,10 +145,7 @@ suites:
- amazon-1 - amazon-1
- centos-6 - centos-6
- debian-8 - debian-8
- fedora-29
- fedora-30
- opensuse-15 - opensuse-15
- opensuse-42
- name: py3-stable-2019-2 - name: py3-stable-2019-2
provisioner: provisioner:
salt_version: 2019.2 salt_version: 2019.2
@ -178,10 +154,7 @@ suites:
- amazon-1 - amazon-1
- centos-6 - centos-6
- debian-8 - debian-8
- fedora-29
- fedora-30
- opensuse-15 - opensuse-15
- opensuse-42
- arch - arch
verifier: verifier: