From 078a76b01335bc8b9b0bfe179202db9b3154e779 Mon Sep 17 00:00:00 2001
From: Olivier Bourdon <obourdon@mirantis.com>
Date: Tue, 18 Oct 2016 14:14:21 +0200
Subject: [PATCH] Fix for enabling use of MOS7

Support Zabbix 2.5.1 plugin on MOS7, MOS8 and MOS9
Update fuel-devops to 2.9.23 like all branches of fuel-qa

Change-Id: I176c6a921dfd53ce83b860e0259ab63a850df1f5
---
 requirements.txt                     | 12 ------------
 requirements/mos7-requirements.txt   |  3 +++
 requirements/mos8-requirements.txt   |  3 +++
 requirements/mos9-requirements.txt   |  3 +++
 requirements/requirements.txt        | 10 ++++++++++
 stacklight_tests/helpers/helpers.py  |  2 +-
 utils/fuel-qa-builder/prepare_env.sh |  7 ++++++-
 7 files changed, 26 insertions(+), 14 deletions(-)
 delete mode 100644 requirements.txt
 create mode 100644 requirements/mos7-requirements.txt
 create mode 100644 requirements/mos8-requirements.txt
 create mode 100644 requirements/mos9-requirements.txt
 create mode 100644 requirements/requirements.txt

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 99bb7bc..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-elasticsearch<=2.4.0
-git+git://github.com/openstack/fuel-devops.git@2.9.22
-netaddr
-oslo.i18n>=3.1.0  # the more recent python-*client (dependencies of fuel-qa) require at least this version of oslo.i18n
-python-ceilometerclient
-py-zabbix
-PyYAML
-requests
-selenium
-six
-tox
-xvfbwrapper
diff --git a/requirements/mos7-requirements.txt b/requirements/mos7-requirements.txt
new file mode 100644
index 0000000..9643023
--- /dev/null
+++ b/requirements/mos7-requirements.txt
@@ -0,0 +1,3 @@
+-r requirements.txt
+oslo.i18n>=1.5.0,<1.6.0  # dependencies of fuel-qa require specific version of oslo.i18n
+python-ceilometerclient<1.3
diff --git a/requirements/mos8-requirements.txt b/requirements/mos8-requirements.txt
new file mode 100644
index 0000000..34d87dc
--- /dev/null
+++ b/requirements/mos8-requirements.txt
@@ -0,0 +1,3 @@
+-r requirements.txt
+oslo.i18n>=3.1.0  # the more recent python-*client (dependencies of fuel-qa) require at least this version of oslo.i18n
+python-ceilometerclient>=2.4
diff --git a/requirements/mos9-requirements.txt b/requirements/mos9-requirements.txt
new file mode 100644
index 0000000..34d87dc
--- /dev/null
+++ b/requirements/mos9-requirements.txt
@@ -0,0 +1,3 @@
+-r requirements.txt
+oslo.i18n>=3.1.0  # the more recent python-*client (dependencies of fuel-qa) require at least this version of oslo.i18n
+python-ceilometerclient>=2.4
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
new file mode 100644
index 0000000..1d6778e
--- /dev/null
+++ b/requirements/requirements.txt
@@ -0,0 +1,10 @@
+elasticsearch<=2.4.0
+git+git://github.com/openstack/fuel-devops.git@2.9.23
+netaddr
+py-zabbix
+PyYAML
+requests
+selenium
+six
+tox
+xvfbwrapper
diff --git a/stacklight_tests/helpers/helpers.py b/stacklight_tests/helpers/helpers.py
index 9b68d9e..ebb68f3 100644
--- a/stacklight_tests/helpers/helpers.py
+++ b/stacklight_tests/helpers/helpers.py
@@ -240,7 +240,7 @@ class PluginHelper(object):
 
     def deploy_cluster(self, nodes_roles, verify_network=False,
                        update_interfaces=True, check_services=True,
-                       timeout=settings.DEPLOYMENT_TIMEOUT):
+                       timeout=getattr(settings, 'DEPLOYMENT_TIMEOUT', 7800)):
         """Assign roles to nodes and deploy the cluster.
 
         :param nodes_roles: nodes to roles mapping.
diff --git a/utils/fuel-qa-builder/prepare_env.sh b/utils/fuel-qa-builder/prepare_env.sh
index 32794ea..46a9e5f 100755
--- a/utils/fuel-qa-builder/prepare_env.sh
+++ b/utils/fuel-qa-builder/prepare_env.sh
@@ -16,6 +16,9 @@ if [ -z "${FUELQA_GITREF}" ]; then
     # Pick up the correct fuel-qa branch depending on the ISO version
     FUEL_VERSION=$(basename "${ISO_PATH}" | egrep -o '[0-9]+\.[0-9]+')
     case "$FUEL_VERSION" in
+    7.0)
+        FUELQA_GITREF="stable/7.0"
+        ;;
     8.0)
         FUELQA_GITREF="stable/8.0"
         ;;
@@ -29,6 +32,8 @@ if [ -z "${FUELQA_GITREF}" ]; then
     esac
 fi
 
+FUEL_REV=`echo $FUELQA_GITREF | sed -e 's?stable/??' -e 's/\.0.*//' -e 's/mitaka/9/'`
+
 # Create the virtual environment if it doesn't exist yet
 if [[ ! -f "$VENV_PATH"/bin/activate ]]; then
     if ! which virtualenv; then
@@ -69,7 +74,7 @@ if [[ "$(pip show fuelweb-test)" == "" ]]; then
 fi
 
 # Install the project's dependencies
-pip install -r"${BASE_DIR}/../../requirements.txt"
+pip install -r"${BASE_DIR}/../../requirements/mos${FUEL_REV}-requirements.txt"
 
 # List the Python packages (this can be useful for troubleshooting)
 pip freeze