From 66f7aa35c3578f0343e611b4c7bf9ad306951f43 Mon Sep 17 00:00:00 2001
From: Andrea Frittoli <andrea.frittoli@gmail.com>
Date: Tue, 7 Mar 2017 15:42:54 +0000
Subject: [PATCH] Add a new DEVSTACK_GATE_TEMPEST_SCENARIOS flag

Add a new flag to run tempest scenarios. This uses the new
tempest scenario tox environment, which run all scenario tests
serially. The DEVSTACK_GATE_TEMPEST_REGEX can be used in
conjunction to filter the list of scenario tests to be executed.

Change-Id: I7d756698a045a436f6d79bbeaf6067879ef6d6dc
---
 devstack-vm-gate-wrap.sh | 3 +++
 devstack-vm-gate.sh      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 13014cfe..2ca68347 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -364,6 +364,9 @@ export DEVSTACK_GATE_TEMPEST_FULL=${DEVSTACK_GATE_TEMPEST_FULL:-0}
 # Set to 1 to run all tempest tests
 export DEVSTACK_GATE_TEMPEST_ALL=${DEVSTACK_GATE_TEMPEST_ALL:-0}
 
+# Set to 1 to run all tempest scenario tests
+export DEVSTACK_GATE_TEMPEST_SCENARIOS=${DEVSTACK_GATE_TEMPEST_SCENARIOS:-0}
+
 # Set to a regex to run tempest with a custom regex filter
 export DEVSTACK_GATE_TEMPEST_REGEX=${DEVSTACK_GATE_TEMPEST_REGEX:-""}
 
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index e4729c45..d3316e39 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -835,6 +835,9 @@ if [[ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]]; then
     elif [[ "$DEVSTACK_GATE_SMOKE_SERIAL" -eq "1" ]] ; then
         echo "Running tempest smoke tests"
         $TEMPEST_COMMAND -esmoke-serial
+    elif [[ "$DEVSTACK_GATE_TEMPEST_SCENARIOS" -eq "1" ]] ; then
+        echo "Running tempest scenario tests"
+        $TEMPEST_COMMAND -escenario -- $DEVSTACK_GATE_TEMPEST_REGEX
     else
         echo "Running tempest smoke tests"
         $TEMPEST_COMMAND -esmoke -- --concurrency=$TEMPEST_CONCURRENCY