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

.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,58 +853,6 @@ steps:
   depends_on:
   - throttle-build
 
-- name: Py2 2018.3(Git)
-  image: saltstack/drone-salt-bootstrap-testing
-  commands:
-  - pip install -U pip
-  - pip install -r tests/requirements.txt
-  - bundle install --with docker --without opennebula ec2 windows vagrant
-  - bundle exec kitchen test py2-git-2018-3-fedora-30
-  environment:
-    DOCKER_HOST: tcp://docker:2375
-  depends_on:
-  - throttle-build
-  - create
-
-- name: Py2 2019.2(Git)
-  image: saltstack/drone-salt-bootstrap-testing
-  commands:
-  - pip install -U pip
-  - pip install -r tests/requirements.txt
-  - bundle install --with docker --without opennebula ec2 windows vagrant
-  - bundle exec kitchen test py2-git-2019-2-fedora-30
-  environment:
-    DOCKER_HOST: tcp://docker:2375
-  depends_on:
-  - throttle-build
-  - create
-
-- name: Py2 2018.3(Stable)
-  image: saltstack/drone-salt-bootstrap-testing
-  commands:
-  - pip install -U pip
-  - pip install -r tests/requirements.txt
-  - bundle install --with docker --without opennebula ec2 windows vagrant
-  - bundle exec kitchen test py2-stable-2018-3-fedora-30
-  environment:
-    DOCKER_HOST: tcp://docker:2375
-  depends_on:
-  - throttle-build
-  - create
-
-- name: Py2 2019.2(Stable)
-  image: saltstack/drone-salt-bootstrap-testing
-  commands:
-  - pip install -U pip
-  - pip install -r tests/requirements.txt
-  - bundle install --with docker --without opennebula ec2 windows vagrant
-  - bundle exec kitchen test py2-stable-2019-2-fedora-30
-  environment:
-    DOCKER_HOST: tcp://docker:2375
-  depends_on:
-  - throttle-build
-  - create
-
 - name: Py3 2018.3(Git)
   image: saltstack/drone-salt-bootstrap-testing
   commands:
@@ -970,6 +918,72 @@ node:
 depends_on:
 - Lint
 
+---
+kind: pipeline
+name: Fedora 31
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: throttle-build
+  image: alpine
+  commands:
+  - sh -c 't=36; echo Sleeping 36 seconds; sleep 36'
+
+- name: create
+  image: saltstack/drone-salt-bootstrap-testing
+  commands:
+  - bundle install --with docker --without opennebula ec2 windows vagrant
+  - echo 'Waiting for docker to start'
+  - sleep 20
+  - docker ps -a
+  - bundle exec kitchen create fedora-31
+  environment:
+    DOCKER_HOST: tcp://docker:2375
+  depends_on:
+  - throttle-build
+
+- name: Py3 2018.3(Git)
+  image: saltstack/drone-salt-bootstrap-testing
+  commands:
+  - pip install -U pip
+  - pip install -r tests/requirements.txt
+  - bundle install --with docker --without opennebula ec2 windows vagrant
+  - bundle exec kitchen test py3-git-2018-3-fedora-31
+  environment:
+    DOCKER_HOST: tcp://docker:2375
+  depends_on:
+  - throttle-build
+  - create
+
+- name: Py3 2019.2(Git)
+  image: saltstack/drone-salt-bootstrap-testing
+  commands:
+  - pip install -U pip
+  - pip install -r tests/requirements.txt
+  - bundle install --with docker --without opennebula ec2 windows vagrant
+  - bundle exec kitchen test py3-git-2019-2-fedora-31
+  environment:
+    DOCKER_HOST: tcp://docker:2375
+  depends_on:
+  - throttle-build
+  - create
+
+services:
+- name: docker
+  image: saltstack/drone-salt-bootstrap-testing
+  command:
+  - --storage-driver=overlay2
+  privileged: true
+
+node:
+  project: open
+
+depends_on:
+- Lint
+
 ---
 kind: pipeline
 name: Opensuse 15.1
@@ -1326,6 +1340,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 9c01a5f3f8d8fe0b09aad2cc73976678a432edf3c81aafdff0d17e52ce4cc7f8
+hmac: 08cacaea37ae92bd156f41af4af3c80da1f2aa535bc41a9efe2f2922c7b51e99
 
 ...

.github/.workflows/templates/generate.py

@@ -16,7 +16,8 @@ LINUX_DISTROS = [
     'debian-8',
     'debian-9',
     'fedora-30',
-    #'fedora-31',
+    'fedora-31',
+    'fedora-32',
     'opensuse-15',
     'ubuntu-1604',
     'ubuntu-1804'
@@ -41,14 +42,17 @@ STABLE_DISTROS = [
 PY2_BLACKLIST = [
     'centos-8',
     'debian-10',
+    'fedora-30',
     'fedora-31',
+    'fedora-32'
 ]
 
 PY3_BLACKLIST = [
+    'arch',         # Defaults to Py3.8
     'amazon-1',
     'centos-6',
     'debian-8',
-    'opensuse-15'
+    'fedora-32'     # Defaults to Py3.8
 ]
 
 BLACKLIST_2018 = [
@@ -61,6 +65,7 @@ SALT_BRANCHES = [
     '2018-3',
     '2019-2',
     '3000',
+    'master',
     'latest'
 ]
 
@@ -68,6 +73,7 @@ BRANCH_DISPLAY_NAMES = {
     '2018-3': 'v2018.3',
     '2019-2': 'v2019.2',
     '3000': 'v3000',
+    'master': 'Master',
     'latest': 'Latest'
 }
 
@@ -93,6 +99,7 @@ DISTRO_DISPLAY_NAMES = {
     'debian-9': 'Debian 9',
     'fedora-30': 'Fedora 30',
     'fedora-31': 'Fedora 31',
+    'fedora-32': 'Fedora 32',
     'opensuse-15': 'Opensuse 15',
     'ubuntu-1604': 'Ubuntu 16.04',
     'ubuntu-1804': 'Ubuntu 18.04'
@@ -133,6 +140,8 @@ def generate_test_jobs():
 
             for python_version in ('py2', 'py3'):
                 for bootstrap_type in ('stable', 'git'):
+                    if bootstrap_type == 'stable' and branch == 'master':
+                        continue
                     if bootstrap_type == 'stable' and distro not in STABLE_DISTROS:
                         continue
 

.github/.workflows/templates/lint.yml

@@ -9,4 +9,4 @@
       - uses: actions/checkout@v1
       - name: ShellCheck
         run: |
-          shellcheck -s sh -f checkstyle bootstrap-salt.sh
+          shellcheck -s sh -f tty bootstrap-salt.sh

.github/.workflows/templates/linux.yml

@@ -1,6 +1,7 @@
   {python_version}-{bootstrap_type}-{branch}-{distro}:
     name: {display_name}
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     needs: lint
 

.kitchen.yml

@@ -49,6 +49,8 @@ platforms:
       provision_command:
         - pacman -Syu --noconfirm --needed systemd grep awk procps which
         - systemctl enable sshd
+    provisioner:
+      salt_bootstrap_options: -MPfq -D -y -x python2 git %s
   - name: centos-8
     driver_config:
       run_command: /usr/lib/systemd/systemd
@@ -77,10 +79,20 @@ platforms:
     driver_config:
       image: fedora:30
       run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - dnf -y install procps-ng
   - name: fedora-31
     driver_config:
       image: fedora:31
       run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - dnf -y install procps-ng
+  - name: fedora-32
+    driver_config:
+      image: fedora:32
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - dnf -y install procps-ng
   - name: opensuse-15
     driver_config:
       image: opensuse/leap:15.1
@@ -118,6 +130,9 @@ suites:
     excludes:
       - arch
       - opensuse-15
+      - fedora-30
+      - fedora-31
+      - fedora-32
   - name: py2-stable-2019-2
     provisioner:
       salt_version: 2019.2
@@ -125,6 +140,9 @@ suites:
     excludes:
       - arch
       - opensuse-15
+      - fedora-30
+      - fedora-31
+      - fedora-32
 
   - name: py3-git-2018-3
     provisioner:
@@ -134,17 +152,16 @@ suites:
       - amazon-1
       - centos-6
       - debian-8
-      - opensuse-15
       - amazon-2
   - name: py3-git-3000
     provisioner:
       salt_version: 3000
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
+      - arch
       - amazon-1
       - centos-6
       - debian-8
-      - opensuse-15
   - name: py3-git-2019-2
     provisioner:
       salt_version: 2019.2
@@ -153,7 +170,6 @@ suites:
       - amazon-1
       - centos-6
       - debian-8
-      - opensuse-15
   - name: py3-stable-2018-3
     provisioner:
       salt_version: 2018.3
@@ -174,6 +190,17 @@ suites:
       - debian-8
       - opensuse-15
       - arch
+  - name: py3-git-master
+    provisioner:
+      salt_version: master
+      salt_bootstrap_options: -x python3 -MPfq -D git %s
+    excludes:
+      - arch
+      - amazon-1
+      - centos-6
+      - debian-8
+      - fedora-32
+      - opensuse-15
 
   - name: latest
     provisioner:

ChangeLog

@@ -1,5 +1,10 @@
 Version TBD (In Progress on the Develop Branch):
 
+Version 2020.02.04:
+	* Add support for the Salt Neon(3000) release (s0undt3ch) #1424
+	* Drop support for Fedora < 30 (s0undt3ch) #1424
+	* Drop support for Debian < 8 (s0undt3ch) #1424
+
 Version 2020.01.29:
     * FreeBSD fixes (cedwards) #1413
     * Support the upcoming Neon release (s0undt3ch) #1420

README.rst

@@ -28,6 +28,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2020.01.29: ``e9afdfa877998c1c7f0e141a6728b33d0d24348e197aab2b9bde4fe6bc6db1b2``
 - 2020.01.21: ``53299aa0dfbf7ab381f3856bb7babfc04a1d6525be11db0b9466277b1e4d0c1a``
 - 2019.11.04: ``905924fccd4ebf168d19ba598bf10af53efe02302b792aeb15433e73fd3ad1d2``
 - 2019.10.03: ``34f196f06d586ce9e1b9907660ea6e67caf57abcecfea66e0343697e3fd0d17d``
@@ -357,13 +358,15 @@ this offering, while limited, is as follows:
 
 - CentOS 7
 - Centos 8
+- Debian 8
 - Debian 9
 - Debian 10
 - Fedora (only git installations)
 - Ubuntu 16.04
 - Ubuntu 18.04
 
-On Fedora 28, PIP installation must be allowed (-P) due to incompatibility with the shipped Tornado library.
+On Fedora, PIP installation must be allowed (-P) due to incompatibility with the shipped Tornado
+library.
 
 Installing the Python 3 packages for Salt is done via the ``-x`` option:
 
@@ -434,6 +437,18 @@ The ``Dockerfile`` here inherits the Ubuntu 14.04 public image with Upstart conf
 system. Use it as an example or starting point of how to make your own Docker images with suitable
 Salt components, custom configurations, and even `pre-accepted Minion keys`_ already installed.
 
+Updating Drone Pipelines
+========================
+
+You should install and configure the drone-cli as shown here: https://docs.drone.io/cli/install/
+
+Make edits to .drone.jsonnet and then save them into the .drone.yml by doing the following:
+
+.. code:: console
+
+  drone jsonnet --format --stream
+  drone sign saltstack/salt-bootstrap --save
+
 .. _Contributing Guidelines: https://github.com/saltstack/salt-bootstrap/blob/develop/CONTRIBUTING.md
 .. _Docker: https://www.docker.com/
 .. _`pre-accepted Minion keys`: https://docs.saltstack.com/en/latest/topics/tutorials/preseed_key.html