summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-10-15 17:34:49 -0400
committerTim Rozet <trozet@redhat.com>2018-10-15 17:34:49 -0400
commit45ab456a7139a96b34b1ef94667ce2bf317ecaa0 (patch)
tree85bfcf1ed14ed0949e382d59f47f9444b222c855
parent514f2e4b66c34b86da21131da16718a0450ae72b (diff)
CPERF: Reduce CSIT for HA deployments
Since CSIT does not pass on HA, but we still want to promote some snapshots for HA, reduce the CSIT suites to L2 and L3 only. Change-Id: Iaf739f972211c1e94de781a006065d7130ddf1c3 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-xjjb/cperf/cperf-robot-netvirt-csit.sh30
1 files changed, 18 insertions, 12 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index a5bb6e784..abd62a39d 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -148,18 +148,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..."