From 0555247b5c8f53f93745291d3c44c408b2bf8771 Mon Sep 17 00:00:00 2001
From: Gabriele Cerami <gcerami@redhat.com>
Date: Fri, 13 Jan 2017 16:33:00 +0100
Subject: [PATCH] OOQ/OVB: Add configurations for tempest job

This change is about replacing current tempest job with a one using
quickstart, proposed in https://review.openstack.org/420647.
We specify a new name and job type containing "oooq" so quickstart
script will be activated, and inside this script we're checking if the
TOCI_JOBTYPE contains the pattern to trigger tempest.
We are changing the test to apply on nonha deployments instead of HA,
and setting the ansible variables accordingly.
The configuration tested locally for a successful full tempest run use
the minimal_pacemaker quickstart configuration, but overriding the
variables that activate the ping test and set the variables that
activate tempest test. Cinder-backup service is not enable by default
and we are enabling to make some tests pass.i
We're going to run the full list of tests, with some exceptions added to
the skip list.

Change-Id: I3084e020e6997efd804306b3350dc9752cda549e
---
 toci_instack_oooq.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/toci_instack_oooq.sh b/toci_instack_oooq.sh
index bb489ae5c..abec19837 100755
--- a/toci_instack_oooq.sh
+++ b/toci_instack_oooq.sh
@@ -26,11 +26,16 @@ if [[ -n "$ZUUL_CHANGES" ]]; then
     export USE_DELOREAN=1
 fi
 
+EXTRA_ARGS=""
+
 # TODO(sshnaidm): To create tripleo-ci special yaml config files in oooq
 # for every TOCI_JOBTYPE, i.e. ovb-nonha-ipv6.yml
 
 if [[ $CONTAINERS == 1 ]]; then
     CONFIG=${CONFIG:-"$TRIPLEO_ROOT/tripleo-ci/scripts/quickstart/containers_minimal.yml"}
+elif [[ "$TOCI_JOBTYPE" =~ "-nonha-tempest" ]]; then
+    CONFIG=${CONFIG:-"$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/minimal_pacemaker.yml"}
+    EXTRA_ARGS="$EXTRA_ARGS -e test_ping=false -e tempest_config=true -e run_tempest=true -e test_regex='.*' -e enable_cinder_backup=true"
 elif [[ "$TOCI_JOBTYPE" =~ "-ha" ]]; then
     CONFIG=${CONFIG:-"$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/ha.yml"}
 elif [[ "$TOCI_JOBTYPE" =~ "-nonha" ]]; then
@@ -95,7 +100,11 @@ if [[ -e ${OOO_WORKDIR_LOCAL}/overcloudrc ]]; then
         -t all  \
         --playbook tempest.yml  \
         --extra-vars run_tempest=True  \
-        -e test_regex='.*smoke' undercloud 2>&1| sudo tee $OOOQ_LOGS/quickstart_tempest.log && tempest_exit_value=0 || tempest_exit_value=$?
+        -e test_regex='.*smoke' \
+        $EXTRA_ARGS \
+        undercloud 2>&1| sudo tee $OOOQ_LOGS/quickstart_tempest.log && tempest_exit_value=0 || tempest_exit_value=$?
+else
+    exit_value=1
 fi
 
 # TODO(sshnaidm): to prepare collect-logs role for tripleo-ci specific paths