From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 21 Aug 2019 18:06:44 +0000 (+0000)
Subject: Merge "Fix TESTOPTIONS and SUITES variables"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b8ee9c1a3c6feef4e788a61a579f6cc2d39474d8;hp=9fc47088ce6e1047d2ab6e44e1512a1371cbf359;p=releng%2Fbuilder.git

Merge "Fix TESTOPTIONS and SUITES variables"
---

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 6569665aa..0ca5106ce 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -917,7 +917,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_COMPUTE_NODES}"); do
     fi
     fix_libvirt_python_build "${!COMPUTEIP}"
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
-    ssh "${!COMPUTEIP} ""cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
+    ssh "${!COMPUTEIP}" "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh "${!COMPUTEIP}" "ps -ef | grep stack.sh"
     os_node_list+=("${!COMPUTEIP}")
 done
diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 164759426..69d329963 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -15,7 +15,8 @@
       - gerrit-jjb-merge:
           build-node: centos7-builder-4c-4g
           build-timeout: 90
-      - gerrit-jjb-verify
+      - gerrit-jjb-verify:
+          build-timeout: 90
       - builder-check-poms
       - builder-copy-sandbox-logs
       - gerrit-tox-verify