Merge "Fix duplicate IMAGE_PROPERTIES env variable in functest run"

[releng.git] / jjb / cperf / cperf-robot-netvirt-csit.sh

diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index a5bb6e7..892f0aa 100755 (executable)
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -4,6 +4,11 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+if [[ ! -z ${SKIP_CSIT+x} && "$SKIP_CSIT" == "True" ]]; then
+  echo "Skipping csit run"
+  exit 0
+fi
+
 if [ "$OS_VERSION" == 'master' ]; then
   FULL_OS_VER='master'
 else
@@ -148,18 +153,24 @@ SUITE_HOME='/home/opnfv/repos/odl_test/csit/suites'
 # This suite fails with an error indicating the connection was closed
 # to the overcloud control node:
 # https://build.opnfv.org/ci/job/cperf-apex-csit-master/104/consoleFull
-
-suites="${SUITE_HOME}/openstack/connectivity/l2.robot \
-        ${SUITE_HOME}/openstack/connectivity/l3.robot \
-        ${SUITE_HOME}/openstack/connectivity/external_network.robot \
-        ${SUITE_HOME}/openstack/connectivity/security_group.robot \
-        ${SUITE_HOME}/openstack/securitygroup/neutron_security_group.robot \
-        ${SUITE_HOME}/openstack/securitygroup/security_group_l3bcast.robot \
-        ${SUITE_HOME}/netvirt/vpnservice/vpn_basic.robot \
-        ${SUITE_HOME}/netvirt/elan/elan.robot \
-        ${SUITE_HOME}/netvirt/vpnservice/arp_learning.robot \
-        ${SUITE_HOME}/netvirt/l2l3_gatewaymac_arp.robot \
-        ${SUITE_HOME}/integration/Create_JVM_Plots.robot"
+#
+# Minimize HA CSIT as it does not pass all suites
+if [ "$NUM_CONTROL_NODES" -eq 3 ]; then
+  suites="${SUITE_HOME}/openstack/connectivity/l2.robot \
+          ${SUITE_HOME}/openstack/connectivity/l3.robot"
+else
+  suites="${SUITE_HOME}/openstack/connectivity/l2.robot \
+          ${SUITE_HOME}/openstack/connectivity/l3.robot \
+          ${SUITE_HOME}/openstack/connectivity/external_network.robot \
+          ${SUITE_HOME}/openstack/connectivity/security_group.robot \
+          ${SUITE_HOME}/openstack/securitygroup/neutron_security_group.robot \
+          ${SUITE_HOME}/openstack/securitygroup/security_group_l3bcast.robot \
+          ${SUITE_HOME}/netvirt/vpnservice/vpn_basic.robot \
+          ${SUITE_HOME}/netvirt/elan/elan.robot \
+          ${SUITE_HOME}/netvirt/vpnservice/arp_learning.robot \
+          ${SUITE_HOME}/netvirt/l2l3_gatewaymac_arp.robot \
+          ${SUITE_HOME}/integration/Create_JVM_Plots.robot"
+fi
 
 echo "Robot command set: ${robot_cmd}"
 echo "Running robot..."