Merge "Don't allow retry to fail stacking"

[releng/builder.git] / jjb / integration / integration-deploy-openstack-run-test.sh

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 451bb20c4b35f0acac6339f88f137332c03e4095..d7108c9a5a7cb7641dcb0971f693dd8796387e84 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -126,7 +126,7 @@ function install_openstack_clients_in_robot_vm() {
 
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
         #networking-l2gw is not officially available in any release yet. Gettting the latest stable version.
-        $PYTHON -m pip install networking-l2gw
+        $PYTHON -m pip install networking-l2gw==11.0.0
     fi
 }
 
@@ -844,8 +844,10 @@ CORE_OS_CONTROL_SERVICES+=",odl-compute,odl-neutron"
 # Additional services
 CORE_OS_CONTROL_SERVICES+=",mysql,rabbit"
 
+# collect performance stats
+CORE_OS_COMPUTE_SERVICES="dstat"
 # computes only need nova and odl
-CORE_OS_COMPUTE_SERVICES="n-cpu,odl-compute"
+CORE_OS_COMPUTE_SERVICES+=",n-cpu,odl-compute"
 
 cat > ${WORKSPACE}/disable_firewall.sh << EOF
 sudo systemctl stop firewalld
@@ -1188,10 +1190,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
         sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
     "
-    # Control Node - set VXLAN TEP IP for Genius Auto TZ
-    ${SSH} ${!CONTROLIP} "
-        sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP};
-    "
 
     # Control Node - external net internet address simulation
     ${SSH} ${!CONTROLIP} "
@@ -1296,14 +1294,19 @@ echo "Starting Robot test suites ${SUITES} ..."
 # please add pybot -v arguments on a single line and alphabetized
 suite_num=0
 for suite in ${SUITES}; do
-    # prepend a incrmental counter to the suite name so that the full robot log combining all the suites as is done
-    # in the rebot step below will list all the suites in chronological order as rebot seems to alphabatize them
+    # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
+    # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them
     let "suite_num = suite_num + 1"
     suite_index="$(printf %02d ${suite_num})"
     suite_name="$(basename ${suite} | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
-    pybot -N ${log_name} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+    pybot -N ${log_name} \
+    -c critical -e exclude -e skip_if_${DISTROSTREAM} \
     --log log_${log_name}.html --report None --output output_${log_name}.xml \
+    --removekeywords wuks \
+    --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \
+    --removekeywords name:SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing \
+    --removekeywords name:OpenStackOperations.Add_OVS_Logging_On_All_OpenStack_Nodes \
     -v BUNDLEFOLDER:${BUNDLEFOLDER} \
     -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
     -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \