Fix wrong GERRIT_PROJECT

[releng/builder.git] / jjb / integration / integration-apex-run-tests.sh

diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh
index a34dbe92ea76d1d0a3ea9fbbc56f22f0f96c0438..14f9f4a8a613d4c3adbcd7aaf631709e52c04edf 100644 (file)
--- a/jjb/integration/integration-apex-run-tests.sh
+++ b/jjb/integration/integration-apex-run-tests.sh
@@ -12,6 +12,10 @@ print_job_parameters
 
 get_os_deploy
 
+configure_karaf_log_for_apex $OPENSTACK_CONTROL_NODE_1_IP
+get_features
+configure_odl_features_for_apex $OPENSTACK_CONTROL_NODE_1_IP
+
 # Swap out the ODL distribution
 DISTRO_UNDER_TEST=/tmp/odl.tar.gz
 wget --progress=dot:mega ${ACTUAL_BUNDLE_URL}
@@ -103,7 +107,7 @@ ssh ${OPENSTACK_COMPUTE_NODE_2_IP} "sudo ovs-vsctl show"
 get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
-# please add pybot -v arguments on a single line and alphabetized
+# please add robot -v arguments on a single line and alphabetized
 suite_num=0
 for suite in ${SUITES}; do
     # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
@@ -112,7 +116,7 @@ for suite in ${SUITES}; do
     suite_index="$(printf %02d ${suite_num})"
     suite_name="$(basename ${suite} | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
-    pybot -N ${log_name} \
+    robot -N ${log_name} \
     -c critical -e exclude -e skip_if_${DISTROSTREAM} -e NON_GATE \
     --log log_${log_name}.html --report report_${log_name}.html --output output_${log_name}.xml \
     --removekeywords wuks \
@@ -152,6 +156,7 @@ for suite in ${SUITES}; do
     -v RESTCONFPORT:8081 \
     -v SECURITY_GROUP_MODE:${SECURITY_GROUP_MODE} \
     -v SSH_KEY:robot_id_rsa \
+    -v TOOLS_SYSTEM_IP: \
     -v USER_HOME:${HOME} \
     -v WORKSPACE:/tmp \
     ${TESTOPTIONS} ${suite} || true