Merge pull request #1427 from s0undt3ch/stable

Merge Develop Into Stable For Release

.drone.jsonnet

@@ -27,9 +27,10 @@ local distros = [
   { name: 'CentOS 7', slug: 'centos-7', multiplier: 4, depends: [] },
   { name: 'CentOS 8', slug: 'centos-8', multiplier: 5, depends: [] },
   { name: 'Debian 8', slug: 'debian-8', multiplier: 6, depends: [] },
-  { name: 'Debian 9', slug: 'debian-9', multiplier: 5, depends: [] },
-  { name: 'Debian 10', slug: 'debian-10', multiplier: 4, depends: [] },
-  { name: 'Fedora 30', slug: 'fedora-30', multiplier: 3, depends: [] },
+  { name: 'Debian 9', slug: 'debian-9', multiplier: 7, depends: [] },
+  { name: 'Debian 10', slug: 'debian-10', multiplier: 5, depends: [] },
+  { name: 'Fedora 30', slug: 'fedora-30', multiplier: 4, depends: [] },
+  { name: 'Fedora 31', slug: 'fedora-31', multiplier: 3, depends: [] },
   { name: 'Opensuse 15.1', slug: 'opensuse-15', multiplier: 2, depends: [] },
   { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] },
   { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] },
@@ -59,11 +60,14 @@ local py3_distros = [
   'ubuntu-1604',
   'ubuntu-1804',
   'fedora-30',
+  'fedora-31',
 ];
 
 local py2_blacklist = [
   'centos-8',
   'debian-10',
+  'fedora-30',
+  'fedora-31',
 ];
 
 local blacklist_2018 = [

.drone.yml

@@ -628,7 +628,7 @@ steps:
 - name: throttle-build
   image: alpine
   commands:
-  - sh -c 't=240; echo Sleeping 240 seconds; sleep 240'
+  - sh -c 't=336; echo Sleeping 336 seconds; sleep 336'
 
 - name: create
   image: saltstack/drone-salt-bootstrap-testing
@@ -772,7 +772,7 @@ steps:
 - name: throttle-build
   image: alpine
   commands:
-  - sh -c 't=48; echo Sleeping 48 seconds; sleep 48'
+  - sh -c 't=60; echo Sleeping 60 seconds; sleep 60'
 
 - name: create
   image: saltstack/drone-salt-bootstrap-testing
@@ -838,7 +838,7 @@ steps:
 - name: throttle-build
   image: alpine
   commands:
-  - sh -c 't=144; echo Sleeping 144 seconds; sleep 144'
+  - sh -c 't=96; echo Sleeping 96 seconds; sleep 96'
 
 - name: create
   image: saltstack/drone-salt-bootstrap-testing
@@ -853,104 +853,118 @@ steps:
   depends_on:
   - throttle-build
 
-- name: Py2 2018.3(Git)
+- 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 py2-git-2018-3-fedora-30
+  - bundle exec kitchen test py3-git-2018-3-fedora-30
   environment:
     DOCKER_HOST: tcp://docker:2375
   depends_on:
   - throttle-build
   - create
 
-- name: Py2 2019.2(Git)
+- 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 py2-git-2019-2-fedora-30
+  - bundle exec kitchen test py3-git-2019-2-fedora-30
   environment:
     DOCKER_HOST: tcp://docker:2375
   depends_on:
   - throttle-build
   - create
 
-- name: Py2 2018.3(Stable)
+- 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 py2-stable-2018-3-fedora-30
+  - bundle exec kitchen test py3-stable-2018-3-fedora-30
   environment:
     DOCKER_HOST: tcp://docker:2375
   depends_on:
   - throttle-build
   - create
 
-- name: Py2 2019.2(Stable)
+- 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 py2-stable-2019-2-fedora-30
+  - bundle exec kitchen test py3-stable-2019-2-fedora-30
   environment:
     DOCKER_HOST: tcp://docker:2375
   depends_on:
   - throttle-build
   - create
 
-- name: Py3 2018.3(Git)
+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:
-  - 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
+  - sh -c 't=36; echo Sleeping 36 seconds; sleep 36'
 
-- name: Py3 2019.2(Git)
+- name: create
   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
+  - echo 'Waiting for docker to start'
+  - sleep 20
+  - docker ps -a
+  - bundle exec kitchen create fedora-31
   environment:
     DOCKER_HOST: tcp://docker:2375
   depends_on:
   - throttle-build
-  - create
 
-- name: Py3 2018.3(Stable)
+- 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-stable-2018-3-fedora-30
+  - 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(Stable)
+- 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-stable-2019-2-fedora-30
+  - bundle exec kitchen test py3-git-2019-2-fedora-31
   environment:
     DOCKER_HOST: tcp://docker:2375
   depends_on:
@@ -1326,6 +1340,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 9c01a5f3f8d8fe0b09aad2cc73976678a432edf3c81aafdff0d17e52ce4cc7f8
+hmac: 08cacaea37ae92bd156f41af4af3c80da1f2aa535bc41a9efe2f2922c7b51e99
 
 ...