Add fedora 31 git install support

.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: [] },

.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=192; echo Sleeping 192 seconds; sleep 192'
 
 - name: create
   image: saltstack/drone-salt-bootstrap-testing
@@ -970,6 +970,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: Py2 2018.3(Git)
+  image: saltstack/drone-salt-bootstrap-testing
+  commands:
+  - pip install -U pip
+  - pip install -r tests/requirements.txt
+  - bundle install --with docker --without opennebula ec2 windows vagrant
+  - bundle exec kitchen test py2-git-2018-3-fedora-31
+  environment:
+    DOCKER_HOST: tcp://docker:2375
+  depends_on:
+  - throttle-build
+  - create
+
+- name: Py2 2019.2(Git)
+  image: saltstack/drone-salt-bootstrap-testing
+  commands:
+  - pip install -U pip
+  - pip install -r tests/requirements.txt
+  - bundle install --with docker --without opennebula ec2 windows vagrant
+  - bundle exec kitchen test py2-git-2019-2-fedora-31
+  environment:
+    DOCKER_HOST: tcp://docker:2375
+  depends_on:
+  - throttle-build
+  - create
+
+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 +1392,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 9c01a5f3f8d8fe0b09aad2cc73976678a432edf3c81aafdff0d17e52ce4cc7f8
+hmac: fae909d28bd67c6bfcee0f01f05540c9683aa1a19b7436c5f0a65c5505701db1
 
 ...

bootstrap-salt.sh

@@ -3825,6 +3825,9 @@ install_fedora_stable_post() {
 
 install_fedora_git_deps() {
     if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
+        if [ "$DISTRO_MAJOR_VERSION" -eq 31 ]; then
+                __install_tornado_pip $_PY_EXE
+        fi
         # Packages are named python3-<whatever>
         PY_PKG_VER=3
     else