X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcperf%2Fcperf-robot-netvirt-csit.sh;h=a5bb6e78449711c9d4f90826965bbe4236058d0b;hb=f3df2c4b0fd8078b31b428665aaa73f133e6a9ac;hp=29ce630c2e31525e6dd023b1ae7e91f915d169a0;hpb=20b922b492b6f6f3cc511bdc6623a31f4a06b637;p=releng.git

diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 29ce630c2..a5bb6e784 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -144,6 +144,10 @@ SUITE_HOME='/home/opnfv/repos/odl_test/csit/suites'
 # Live migration will not work unless we use a shared storage backend like
 # Ceph which we do not currently use with CSIT images
 #
+# ${SUITE_HOME}/netvirt/vpnservice/vpn_basic_ipv6.robot
+# 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 \
@@ -152,7 +156,6 @@ suites="${SUITE_HOME}/openstack/connectivity/l2.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/vpnservice/vpn_basic_ipv6.robot \
         ${SUITE_HOME}/netvirt/elan/elan.robot \
         ${SUITE_HOME}/netvirt/vpnservice/arp_learning.robot \
         ${SUITE_HOME}/netvirt/l2l3_gatewaymac_arp.robot \
@@ -166,7 +169,7 @@ docker run -i --net=host \
   -v ${WORKSPACE}/overcloudrc:/tmp/overcloudrc \
   opnfv/cperf:$DOCKER_TAG \
   /bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \
-  cd /home/opnfv/repos/odl_test/ && git pull origin master && git checkout ffa04403057d7d354ca0a2261b6bc7eabf5aeb1d; \
+  cd /home/opnfv/repos/odl_test/ && git pull origin master; \
   pip install odltools; \
   ${robot_cmd} ${suites};"