From 920cb9aae56626fb351b4179dbe52929e8e3a14c Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 10 Aug 2017 09:40:14 -0500
Subject: [PATCH] Gate: Set tests to run only if a deployment of OSH is
 performed

This PS updates the gate script to only run tests of OSH if it is
actually deployed.

Change-Id: Iaf89bbfffb01ca3c7ba7bfc5b5867794c6bfd5e8
---
 tools/gate/setup_gate.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/gate/setup_gate.sh b/tools/gate/setup_gate.sh
index 89be0132c0..ca0bd83b2e 100755
--- a/tools/gate/setup_gate.sh
+++ b/tools/gate/setup_gate.sh
@@ -88,9 +88,11 @@ elif [ "x$INTEGRATION_TYPE" == "xarmada" ]; then
   bash ${WORK_DIR}/tools/gate/armada_launch.sh
 fi
 
-# Run Basic Funtional Full Stack Intergation Tests
-if [ "x$INTEGRATION" == "xaio" ]; then
- bash ${WORK_DIR}/tools/gate/openstack_aio_launch.sh
+if ! [ "x$INTEGRATION_TYPE" == "x" ]; then
+  # Run Basic Full Stack Tests
+  if [ "x$INTEGRATION" == "xaio" ]; then
+   bash ${WORK_DIR}/tools/gate/openstack_aio_launch.sh
+  fi
+  # Collect all logs from the environment
+  bash ${WORK_DIR}/tools/gate/dump_logs.sh 0
 fi
-
-bash ${WORK_DIR}/tools/gate/dump_logs.sh 0