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

Merge pull request #1434 from s0undt3ch/develop

Browse source 
Fix Amazon Linux 2
This commit is contained in:
Pedro Algarvio 2020-02-24 16:33:36 +00:00 • committed by GitHub
commit 068dd3e898
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 1202 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.drone.jsonnet
View file

@ -1,22 +1,26 @@
local git_suites = [
{ name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3', depends: [] },
{ name: 'Py2 2019.2(Git)', slug: 'py2-git-2019-2', depends: ['Py2 2018.3(Git)'] },
{ name: 'Py2 3000(Git)', slug: 'py2-git-3000', depends: ['Py2 2019.2(Git)'] },
// {name: 'Py2 develop(Stable)', slug: 'py2-git-develop'}, // Don't test against Salt's develop branch. Stability is not assured.
];
local git_py3_suites = [
{ name: 'Py3 2018.3(Git)', slug: 'py3-git-2018-3', depends: [] },
{ name: 'Py3 2019.2(Git)', slug: 'py3-git-2019-2', depends: ['Py3 2018.3(Git)'] },
{ name: 'Py3 3000(Git)', slug: 'py3-git-3000', depends: ['Py3 2019.2(Git)'] },
];
local stable_suites = [
{ name: 'Py2 2018.3(Stable)', slug: 'py2-stable-2018-3', depends: ['Py2 2018.3(Git)'] },
{ name: 'Py2 2019.2(Stable)', slug: 'py2-stable-2019-2', depends: ['Py2 2019.2(Git)'] },
{ name: 'Py2 3000(Stable)', slug: 'py2-stable-3000', depends: ['Py2 3000(Git)'] },
];
local stable_py3_suites = [
{ name: 'Py3 2018.3(Stable)', slug: 'py3-stable-2018-3', depends: ['Py3 2018.3(Git)'] },
{ name: 'Py3 2019.2(Stable)', slug: 'py3-stable-2019-2', depends: ['Py3 2019.2(Git)'] },
{ name: 'Py3 3000(Stable)', slug: 'py3-stable-3000', depends: ['Py3 3000(Git)'] },
];
local distros = [
@ -52,7 +56,7 @@ local stable_distros = [
local py3_distros = [
'amazon-2',
'arch',
// 'arch',
'centos-7',
'centos-8',
'debian-9',

457
.drone.yml
View file

@ -65,26 +65,13 @@ steps:
- throttle-build
- create
- name: Py3 2018.3(Git)
- name: Py2 3000(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-arch
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-arch
- bundle exec kitchen test py2-git-3000-arch
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
@ -116,7 +103,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=72; echo Sleeping 72 seconds; sleep 72'
- sh -c 't=120; echo Sleeping 120 seconds; sleep 120'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -157,6 +144,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-amazon-2
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -183,6 +183,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-amazon-2
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -196,6 +209,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-amazon-2
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -209,6 +235,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-amazon-2
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -234,7 +273,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=72; echo Sleeping 72 seconds; sleep 72'
- sh -c 't=108; echo Sleeping 108 seconds; sleep 108'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -275,6 +314,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-centos-6
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -301,6 +353,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-centos-6
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -326,7 +391,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=192; echo Sleeping 192 seconds; sleep 192'
- sh -c 't=288; echo Sleeping 288 seconds; sleep 288'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -367,6 +432,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-centos-7
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -393,6 +471,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-centos-7
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -419,6 +510,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-centos-7
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -445,6 +549,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-centos-7
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -470,7 +587,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=60; echo Sleeping 60 seconds; sleep 60'
- sh -c 't=120; echo Sleeping 120 seconds; sleep 120'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -498,6 +615,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-centos-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -511,6 +641,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-centos-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -536,7 +679,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=144; echo Sleeping 144 seconds; sleep 144'
- sh -c 't=216; echo Sleeping 216 seconds; sleep 216'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -577,6 +720,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-debian-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -603,6 +759,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-debian-8
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -628,7 +797,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=336; echo Sleeping 336 seconds; sleep 336'
- sh -c 't=504; echo Sleeping 504 seconds; sleep 504'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -669,6 +838,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-debian-9
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -695,6 +877,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-debian-9
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -721,6 +916,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-debian-9
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -747,6 +955,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-debian-9
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -772,7 +993,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=60; echo Sleeping 60 seconds; sleep 60'
- sh -c 't=120; echo Sleeping 120 seconds; sleep 120'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -800,6 +1021,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-debian-10
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2019.2(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -813,6 +1047,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-debian-10
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -838,7 +1085,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=96; echo Sleeping 96 seconds; sleep 96'
- sh -c 't=144; echo Sleeping 144 seconds; sleep 144'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -879,6 +1126,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-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:
@ -905,6 +1165,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-fedora-30
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -930,7 +1203,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=36; echo Sleeping 36 seconds; sleep 36'
- sh -c 't=54; echo Sleeping 54 seconds; sleep 54'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -971,6 +1244,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-fedora-31
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -996,7 +1282,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=24; echo Sleeping 24 seconds; sleep 24'
- sh -c 't=36; echo Sleeping 36 seconds; sleep 36'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -1037,6 +1323,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-opensuse-15
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -1062,7 +1361,7 @@ steps:
- name: throttle-build
image: alpine
commands:
- sh -c 't=48; echo Sleeping 48 seconds; sleep 48'
- sh -c 't=72; echo Sleeping 72 seconds; sleep 72'
- name: create
image: saltstack/drone-salt-bootstrap-testing
@ -1103,6 +1402,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-ubuntu-1604
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -1129,6 +1441,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-ubuntu-1604
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -1155,6 +1480,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-ubuntu-1604
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -1181,6 +1519,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-ubuntu-1604
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -1247,6 +1598,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-ubuntu-1804
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py2 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -1273,6 +1637,19 @@ steps:
- throttle-build
- create
- name: Py2 3000(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-3000-ubuntu-1804
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Git)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -1299,6 +1676,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-ubuntu-1804
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
- name: Py3 2018.3(Stable)
image: saltstack/drone-salt-bootstrap-testing
commands:
@ -1325,6 +1715,19 @@ steps:
- throttle-build
- create
- name: Py3 3000(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-3000-ubuntu-1804
environment:
DOCKER_HOST: tcp://docker:2375
depends_on:
- throttle-build
- create
services:
- name: docker
image: saltstack/drone-salt-bootstrap-testing
@ -1340,6 +1743,6 @@ depends_on:
---
kind: signature
hmac: 08cacaea37ae92bd156f41af4af3c80da1f2aa535bc41a9efe2f2922c7b51e99
hmac: 541f7de01e4a4321197c3667ecc63abf147d1f7133a819e7bff1cf64ca83a4e0
...

736
.github/.workflows/main.yml → .github/workflows/main.yml vendored
View file

@ -228,6 +228,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-amazon-2
py2-stable-3000-amazon-2:
name: Amazon 2 v3000 Py2 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py2-stable-3000-amazon-2 || bundle exec kitchen create py2-stable-3000-amazon-2
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py2-stable-3000-amazon-2
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py2-stable-3000-amazon-2
py2-git-3000-amazon-2:
name: Amazon 2 v3000 Py2 Git
runs-on: ubuntu-latest
@ -274,6 +320,52 @@ jobs:
bundle exec kitchen destroy py2-git-3000-amazon-2
py3-stable-3000-amazon-2:
name: Amazon 2 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-amazon-2 || bundle exec kitchen create py3-stable-3000-amazon-2
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-amazon-2
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-amazon-2
py3-git-3000-amazon-2:
name: Amazon 2 v3000 Py3 Git
runs-on: ubuntu-latest
@ -826,6 +918,52 @@ jobs:
bundle exec kitchen destroy py2-git-2019-2-centos-6
py2-stable-3000-centos-6:
name: CentOS 6 v3000 Py2 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py2-stable-3000-centos-6 || bundle exec kitchen create py2-stable-3000-centos-6
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py2-stable-3000-centos-6
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py2-stable-3000-centos-6
py2-git-3000-centos-6:
name: CentOS 6 v3000 Py2 Git
runs-on: ubuntu-latest
@ -1332,6 +1470,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-centos-7
py2-stable-3000-centos-7:
name: CentOS 7 v3000 Py2 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py2-stable-3000-centos-7 || bundle exec kitchen create py2-stable-3000-centos-7
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py2-stable-3000-centos-7
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py2-stable-3000-centos-7
py2-git-3000-centos-7:
name: CentOS 7 v3000 Py2 Git
runs-on: ubuntu-latest
@ -1378,6 +1562,52 @@ jobs:
bundle exec kitchen destroy py2-git-3000-centos-7
py3-stable-3000-centos-7:
name: CentOS 7 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-centos-7 || bundle exec kitchen create py3-stable-3000-centos-7
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-centos-7
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-centos-7
py3-git-3000-centos-7:
name: CentOS 7 v3000 Py3 Git
runs-on: ubuntu-latest
@ -1654,6 +1884,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-centos-8
py3-stable-3000-centos-8:
name: CentOS 8 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-centos-8
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-centos-8
py3-git-3000-centos-8:
name: CentOS 8 v3000 Py3 Git
runs-on: ubuntu-latest
@ -1838,6 +2114,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-debian-10
py3-stable-3000-debian-10:
name: Debian 10 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-debian-10
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-debian-10
py3-git-3000-debian-10:
name: Debian 10 v3000 Py3 Git
runs-on: ubuntu-latest
@ -2114,6 +2436,52 @@ jobs:
bundle exec kitchen destroy py2-git-2019-2-debian-8
py2-stable-3000-debian-8:
name: Debian 8 v3000 Py2 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py2-stable-3000-debian-8 || bundle exec kitchen create py2-stable-3000-debian-8
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py2-stable-3000-debian-8
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py2-stable-3000-debian-8
py2-git-3000-debian-8:
name: Debian 8 v3000 Py2 Git
runs-on: ubuntu-latest
@ -2620,6 +2988,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-debian-9
py2-stable-3000-debian-9:
name: Debian 9 v3000 Py2 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py2-stable-3000-debian-9 || bundle exec kitchen create py2-stable-3000-debian-9
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py2-stable-3000-debian-9
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py2-stable-3000-debian-9
py2-git-3000-debian-9:
name: Debian 9 v3000 Py2 Git
runs-on: ubuntu-latest
@ -2666,6 +3080,52 @@ jobs:
bundle exec kitchen destroy py2-git-3000-debian-9
py3-stable-3000-debian-9:
name: Debian 9 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-debian-9
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-debian-9
py3-git-3000-debian-9:
name: Debian 9 v3000 Py3 Git
runs-on: ubuntu-latest
@ -3034,6 +3494,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-fedora-30
py3-stable-3000-fedora-30:
name: Fedora 30 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-fedora-30 || bundle exec kitchen create py3-stable-3000-fedora-30
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-fedora-30
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-fedora-30
py3-git-3000-fedora-30:
name: Fedora 30 v3000 Py3 Git
runs-on: ubuntu-latest
@ -3356,6 +3862,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-fedora-31
py3-stable-3000-fedora-31:
name: Fedora 31 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-fedora-31 || bundle exec kitchen create py3-stable-3000-fedora-31
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-fedora-31
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-fedora-31
py3-git-3000-fedora-31:
name: Fedora 31 v3000 Py3 Git
runs-on: ubuntu-latest
@ -4322,6 +4874,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-ubuntu-1604
py2-stable-3000-ubuntu-1604:
name: Ubuntu 16.04 v3000 Py2 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py2-stable-3000-ubuntu-1604 || bundle exec kitchen create py2-stable-3000-ubuntu-1604
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py2-stable-3000-ubuntu-1604
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py2-stable-3000-ubuntu-1604
py2-git-3000-ubuntu-1604:
name: Ubuntu 16.04 v3000 Py2 Git
runs-on: ubuntu-latest
@ -4368,6 +4966,52 @@ jobs:
bundle exec kitchen destroy py2-git-3000-ubuntu-1604
py3-stable-3000-ubuntu-1604:
name: Ubuntu 16.04 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-ubuntu-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-ubuntu-1604
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-ubuntu-1604
py3-git-3000-ubuntu-1604:
name: Ubuntu 16.04 v3000 Py3 Git
runs-on: ubuntu-latest
@ -4920,6 +5564,52 @@ jobs:
bundle exec kitchen destroy py3-git-2019-2-ubuntu-1804
py2-stable-3000-ubuntu-1804:
name: Ubuntu 18.04 v3000 Py2 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py2-stable-3000-ubuntu-1804 || bundle exec kitchen create py2-stable-3000-ubuntu-1804
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py2-stable-3000-ubuntu-1804
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py2-stable-3000-ubuntu-1804
py2-git-3000-ubuntu-1804:
name: Ubuntu 18.04 v3000 Py2 Git
runs-on: ubuntu-latest
@ -4966,6 +5656,52 @@ jobs:
bundle exec kitchen destroy py2-git-3000-ubuntu-1804
py3-stable-3000-ubuntu-1804:
name: Ubuntu 18.04 v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 10
needs: lint
steps:
- uses: actions/checkout@v1
- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
- name: Install Bundler
run: |
gem install bundler
- name: Setup Bundle
run: |
bundle install --with docker --without opennebula ec2 windows vagrant
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python Dependencies
run: |
pip install -U pip
pip install -r tests/requirements.txt
- name: Create Test Container
run: |
bundle exec kitchen create py3-stable-3000-ubuntu-1804 || bundle exec kitchen create py3-stable-3000-ubuntu-1804
- name: Test Bootstrap In Test Container
run: |
bundle exec kitchen verify py3-stable-3000-ubuntu-1804
- name: Destroy Test Container
if: always()
run: |
bundle exec kitchen destroy py3-stable-3000-ubuntu-1804
py3-git-3000-ubuntu-1804:
name: Ubuntu 18.04 v3000 Py3 Git
runs-on: ubuntu-latest

1
.github/.workflows/templates/generate.py → .github/workflows/templates/generate.py vendored
View file

@ -78,7 +78,6 @@ BRANCH_DISPLAY_NAMES = {
}
STABLE_BRANCH_BLACKLIST = [
'3000'
]
LATEST_PKG_BLACKLIST = [

0
.github/.workflows/templates/lint.yml → .github/workflows/templates/lint.yml vendored
View file

0
.github/.workflows/templates/linux.yml → .github/workflows/templates/linux.yml vendored
View file

0
.github/.workflows/templates/main.yml → .github/workflows/templates/main.yml vendored
View file

0
.github/.workflows/templates/pre-commit.yml → .github/workflows/templates/pre-commit.yml vendored
View file

20
.kitchen.yml
View file

@ -143,6 +143,16 @@ suites:
- fedora-30
- fedora-31
- fedora-32
- name: py2-stable-3000
provisioner:
salt_version: 3000
salt_bootstrap_options: -MP stable %s
excludes:
- arch
- opensuse-15
- fedora-30
- fedora-31
- fedora-32
- name: py3-git-2018-3
provisioner:
@ -190,6 +200,16 @@ suites:
- debian-8
- opensuse-15
- arch
- name: py3-stable-3000
provisioner:
salt_version: 3000
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

1
AUTHORS.rst
View file

@ -147,6 +147,7 @@ RuriRyan RuriRyan ryan@btsoft.eu
Ryan Walder ryanwalder ryanwalder@ucds.email
Sam sticky-note sammy.smati@skazy.nc
Sebastian Wendel sourceindex
Sebastien Blaisot sblaisot
Sergey Paramonov serge-p serg.paramonov@s-vp.com
Shane Lee twangboy slee@saltstack.com
Shawn Butts shawnbutts

3
ChangeLog
View file

@ -1,4 +1,7 @@
Version TBD (In Progress on the Develop Branch):
* Fix SLES 15 install (max298) #1431
* Fix 3000(Neon) stable install (sblaisot) #1433
* Fix Amazon Linux Py3 install (s0undt3ch) #1434
Version 2020.02.04:
* Add support for the Salt Neon(3000) release (s0undt3ch) #1424

9
bootstrap-salt.sh
View file

@ -606,7 +606,7 @@ elif [ "$ITYPE" = "stable" ]; then
if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000)$')" != "" ]; then
STABLE_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]*(\.[0-9]*)?)$')" != "" ]; then
elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}*(\.[0-9]*)?)$')" != "" ]; then
if [ "$(uname)" = "Darwin" ]; then
STABLE_REV="$1"
else
@ -5240,7 +5240,12 @@ install_amazon_linux_ami_2_git_deps() {
# We're on the master branch, install whichever tornado is on the requirements file
__REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")"
if [ "${__REQUIRED_TORNADO}" != "" ]; then
__PACKAGES="${__PACKAGES} ${pkg_append}${PY_PKG_VER}-tornado"
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq "3" ]; then
__PACKAGES="${__PACKAGES} python3-pip"
__PIP_PACKAGES="${__PIP_PACKAGES} tornado<$_TORNADO_MAX_PY3_VERSION"
else
__PACKAGES="${__PACKAGES} ${pkg_append}${PY_PKG_VER}-tornado"
fi
fi
fi