From 2d78371184c69154ab77324e2ded2cd3777f295a Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Sat, 20 Jul 2019 09:25:53 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: I1e23c07e78c3a4eaebb520ae5a69409b4ed44952
---
 Vagrantfile          | 24 +++++++++++++++---------
 doc/requirements.txt | 11 +++++++++--
 run_tests.sh         |  6 ++++--
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index ba2c361..bf2400c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,14 +31,20 @@ Vagrant.configure(2) do |config|
          ./run_tests.sh
       SHELL
 
-  config.vm.define "ubuntu1604" do |xenial|
-    xenial.disksize.size = "40GB"
-    xenial.vm.box = "ubuntu/xenial64"
+  config.vm.define "centos7" do |centos7|
+    centos7.vm.box = "centos/7"
   end
 
-  config.vm.define "ubuntu1804" do |bionic|
-    bionic.disksize.size = "40GB"
-    bionic.vm.box = "ubuntu/bionic64"
+  config.vm.define "debian8" do |debian8|
+    debian8.vm.box = "debian/jessie64"
+  end
+
+  config.vm.define "debian9" do |debian9|
+    debian9.vm.box = "debian/stretch64"
+  end
+
+  config.vm.define "gentoo" do |gentoo|
+    gentoo.vm.box = "generic/gentoo"
   end
 
   config.vm.define "opensuse150" do |leap150|
@@ -49,8 +55,8 @@ Vagrant.configure(2) do |config|
     leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
   end
 
-  config.vm.define "centos7" do |centos7|
-    centos7.vm.box = "centos/7"
+  config.vm.define "ubuntu1804" do |bionic|
+    bionic.disksize.size = "40GB"
+    bionic.vm.box = "ubuntu/bionic64"
   end
-
 end
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 71c0d0d..12390ff 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,8 +2,15 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-# this is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+# WARNING:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://opendev.org/openstack/openstack-ansible-tests/src/branch/master/sync/doc/requirements.txt
+# If you need to modify this file, update the one in the
+# openstack-ansible-tests repository. Once it merges there, the changes will
+# automatically be proposed to all the repositories which use it.
+
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
diff --git a/run_tests.sh b/run_tests.sh
index cd30a60..3129599 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -65,7 +65,10 @@ case ${ID,,} in
 esac
 
 # Install git so that we can clone the tests repo if git is not available
-which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git
+case ${ID,,} in
+  gentoo) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" dev-vcs/git ;;
+  *) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git ;;
+esac
 
 # Clone the tests repo for access to the common test script
 if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
@@ -92,4 +95,3 @@ fi
 
 # Execute the common test script
 source tests/common/run_tests_common.sh
-