Merge remote-tracking branch 'upstream/develop' into stable

2025-04-16 09:40:21 +00:00 · 2020-02-24 16:39:39 +00:00 · 2020-02-24 16:39:39 +00:00 · 6e43b3a801
commit 6e43b3a801
parent 913653f79a ee9d9aa467
14 changed files with 1289 additions and 46 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -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',
--- a/.drone.yml
+++ b/.drone.yml
@ -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

 ...
--- a/.github/.workflows/main.yml
+++ b/.github/.workflows/main.yml
@ -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
--- a/.github/.workflows/templates/generate.py
+++ b/.github/.workflows/templates/generate.py
@ -78,7 +78,6 @@ BRANCH_DISPLAY_NAMES = {
 }

 STABLE_BRANCH_BLACKLIST = [
-    '3000'
 ]

 LATEST_PKG_BLACKLIST = [
--- a/.github/.workflows/templates/lint.yml
+++ b/.github/.workflows/templates/lint.yml
--- a/.github/.workflows/templates/linux.yml
+++ b/.github/.workflows/templates/linux.yml
--- a/.github/.workflows/templates/main.yml
+++ b/.github/.workflows/templates/main.yml
--- a/.github/.workflows/templates/pre-commit.yml
+++ b/.github/.workflows/templates/pre-commit.yml
--- a/.kitchen.yml
+++ b/.kitchen.yml
@ -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
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@ -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
--- a/5
+++ b/5
@ -1,5 +1,10 @@
 Version TBD (In Progress on the Develop Branch):

+Version 2020.02.24:
+	* 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
 	* Drop support for Fedora < 30 (s0undt3ch) #1424
--- a/README.rst
+++ b/README.rst
@ -20,6 +20,8 @@ This ``README`` file is not the absolute truth as to what the bootstrap script i
 that, please read the generated help by passing ``-h`` to the script or even better,
 `read the source`_.

+Also, to secure your Salt installation, check out these instructions for `hardening salt`_.
+
 Bootstrap
 =========

@ -28,6 +30,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.

 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:

+- 2020.02.04: ``ce877651b4938e3480f76b1629f582437f6ca8b73d7199fdb9e905e86fe85b34``
 - 2020.01.29: ``e9afdfa877998c1c7f0e141a6728b33d0d24348e197aab2b9bde4fe6bc6db1b2``
 - 2020.01.21: ``53299aa0dfbf7ab381f3856bb7babfc04a1d6525be11db0b9466277b1e4d0c1a``
 - 2019.11.04: ``905924fccd4ebf168d19ba598bf10af53efe02302b792aeb15433e73fd3ad1d2``
@ -460,6 +463,7 @@ Make edits to .drone.jsonnet and then save them into the .drone.yml by doing the
 .. _`SaltStack's Ubuntu repository`: http://repo.saltstack.com/#ubuntu
 .. _`Ubuntu's release schedule`: https://wiki.ubuntu.com/Releases
 .. _Vagrant: http://www.vagrantup.com
+.. _hardening salt: https://docs.saltstack.com/en/latest/topics/hardening.html

 .. |build|  image:: https://drone.saltstack.com/api/badges/saltstack/salt-bootstrap/status.svg
    :target: https://drone.saltstack.com/saltstack/salt-bootstrap
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@ -77,11 +77,13 @@
 Param(
    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
    # Doesn't support versions prior to "YYYY.M.R-B"
-    [ValidatePattern('^201\d\.\d{1,2}\.\d{1,2}(\-\d{1})?|(rc\d)$')]
+    # Supports new version and latest
+    # Option 1 means case insensitive
+    [ValidatePattern('^(\d{4}(\.\d{1,2}){0,2}(\-\d{1})?)|(latest)$', Options=1)]
    [string]$version = '',

    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
-    # Doesn't support versions prior to "2017.7.0"
+    # Doesn't support Python versions prior to "2017.7.0"
    [ValidateSet("2","3")]
    [string]$pythonVersion = "2",

@ -99,8 +101,8 @@ Param(
    [string]$repourl= "https://repo.saltstack.com/windows"
 )

-# Powershell supports only TLS 1.0 by default. Add support up to TLS 1.2
-[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'
+# Powershell supports only TLS 1.0 by default. Add support for TLS 1.2
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12'

 #===============================================================================
 # Script Functions
@ -213,7 +215,7 @@ Else {
 #===============================================================================
 # Use version "Latest" if no version is passed
 #===============================================================================
-If (!$version) {
+If ((!$version) -or ($version.ToLower() -eq 'latest')){
    $versionSection = "Latest-Py$pythonVersion"
 } else {
    $versionSection = $version
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error

-__ScriptVersion="2020.02.04"
+__ScriptVersion="2020.02.24"
 __ScriptName="bootstrap-salt.sh"

 __ScriptFullName="$0"
@ -603,10 +603,10 @@ elif [ "$ITYPE" = "stable" ]; then
    if [ "$#" -eq 0 ];then
        STABLE_REV="latest"
    else
-        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)$')" != "" ]; 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 '^([0-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
@ -614,7 +614,7 @@ elif [ "$ITYPE" = "stable" ]; then
            fi
            shift
        else
-            echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, latest, \$MAJOR.\$MINOR.\$PATCH)"
+            echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
            exit 1
        fi
    fi
@ -1446,6 +1446,9 @@ __ubuntu_codename_translation() {
        "18")
            DISTRO_CODENAME="bionic"
            ;;
+        "20")
+            DISTRO_CODENAME="focal"
+            ;;
        *)
            DISTRO_CODENAME="trusty"
            ;;
@ -1606,14 +1609,16 @@ __check_end_of_life_versions() {
            #
            # < 11 SP4
            # < 12 SP2
-            SUSE_PATCHLEVEL=$(awk '/PATCHLEVEL/ {print $3}' /etc/SuSE-release )
+            # < 15 SP1
+            SUSE_PATCHLEVEL=$(awk -F'=' '/VERSION_ID/ { print $2 }' /etc/os-release | grep -oP "\.\K\w+")
            if [ "${SUSE_PATCHLEVEL}" = "" ]; then
                SUSE_PATCHLEVEL="00"
            fi
            if [ "$DISTRO_MAJOR_VERSION" -lt 11 ] || \
                { [ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 04 ]; } || \
+                { [ "$DISTRO_MAJOR_VERSION" -eq 15 ] && [ "$SUSE_PATCHLEVEL" -lt 01 ]; } || \
                { [ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]; }; then
-                echoerror "Versions lower than SuSE 11 SP4 or 12 SP2 are not supported."
+                echoerror "Versions lower than SuSE 11 SP4, 12 SP2 or 15 SP1 are not supported."
                echoerror "Please consider upgrading to the next stable"
                echoerror "    https://www.suse.com/lifecycle/"
                exit 1
@ -2578,7 +2583,7 @@ __install_pip_pkgs() {
    if ! __check_command_exists "${_pip_cmd} --version"; then
        __PACKAGES="${_py_pkg}-setuptools ${_py_pkg}-pip gcc"
        # shellcheck disable=SC2086
-        if [ "$DISTRO_NAME_L" = "debian" ];then
+        if [ "$DISTRO_NAME_L" = "debian" ] || [ "$DISTRO_NAME_L" = "ubuntu" ];then
            __PACKAGES="${__PACKAGES} ${_py_pkg}-dev"
            __apt_get_install_noinput ${__PACKAGES} || return 1
        else
@ -2872,9 +2877,9 @@ __enable_universe_repository() {

 __install_saltstack_ubuntu_repository() {
    # Workaround for latest non-LTS ubuntu
-    if [ "$DISTRO_MAJOR_VERSION" -gt 18 ] || \
+    if [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
        { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
-        echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for latest LTS release. You may experience problems."
+        echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
        UBUNTU_VERSION=18.04
        UBUNTU_CODENAME="bionic"
    else
@ -5235,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

@ -6206,7 +6216,13 @@ __zypper() {
        sleep 1
    done

-    zypper --non-interactive "${@}"; return $?
+    zypper --non-interactive "${@}"
+    # Return codes between 100 and 104 are only informations, not errors
+    # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES
+    if [ "$?" -gt "99" ] && [ "$?" -le "104" ]; then
+        return 0
+    fi
+    return $?
 }

 __zypper_install() {
@ -6339,7 +6355,6 @@ install_opensuse_stable() {
 }

 install_opensuse_git() {
-
    if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then
         __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1
        return 0
@ -6575,6 +6590,60 @@ install_opensuse_15_git() {
 #
 #######################################################################################################################

+#######################################################################################################################
+#
+#   SUSE Enterprise 15
+#
+
+install_suse_15_stable_deps() {
+    __opensuse_prep_install || return 1
+    install_opensuse_15_stable_deps || return 1
+
+    return 0
+}
+
+install_suse_15_git_deps() {
+    install_suse_15_stable_deps || return 1
+
+    if ! __check_command_exists git; then
+        __zypper_install git-core  || return 1
+    fi
+
+    install_opensuse_15_git_deps || return 1
+
+    return 0
+}
+
+install_suse_15_stable() {
+    install_opensuse_stable || return 1
+    return 0
+}
+
+install_suse_15_git() {
+    install_opensuse_15_git || return 1
+    return 0
+}
+
+install_suse_15_stable_post() {
+    install_opensuse_stable_post || return 1
+    return 0
+}
+
+install_suse_15_git_post() {
+    install_opensuse_git_post || return 1
+    return 0
+}
+
+install_suse_15_restart_daemons() {
+    install_opensuse_restart_daemons || return 1
+    return 0
+}
+
+#
+#   End of SUSE Enterprise 15
+#
+#######################################################################################################################
+
 #######################################################################################################################
 #
 #   SUSE Enterprise 12