Add ability to tweak log levels in apex job

[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 3ca393f49b8ca8ff22fdc2ca3204af835b8d684d..4c7692b9d356749867b594043702d8854bc3b597 100644 (file)
--- a/jjb/integration/integration-apex-run-tests.sh
+++ b/jjb/integration/integration-apex-run-tests.sh
@@ -8,8 +8,12 @@ source /tmp/common-functions.sh ${BUNDLEFOLDER}
 # Ensure we fail the job if any steps fail.
 set -ex -o pipefail
 
+print_job_parameters
+
 get_os_deploy
 
+configure_karaf_log_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}
@@ -98,25 +102,10 @@ ssh ${OPENSTACK_CONTROL_NODE_1_IP} "sudo ovs-vsctl show"
 ssh ${OPENSTACK_COMPUTE_NODE_1_IP} "sudo ovs-vsctl show"
 ssh ${OPENSTACK_COMPUTE_NODE_2_IP} "sudo ovs-vsctl show"
 
-# Use the testplan if specific SUITES are not defined.
-if [ -z "${SUITES}" ]; then
-    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
-else
-    newsuites=""
-    workpath="${WORKSPACE}/test/csit/suites"
-    for suite in ${SUITES}; do
-        fullsuite="${workpath}/${suite}"
-        if [ -z "${newsuites}" ]; then
-            newsuites+=${fullsuite}
-        else
-            newsuites+=" "${fullsuite}
-        fi
-    done
-    SUITES=${newsuites}
-fi
+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
@@ -125,7 +114,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 \
@@ -144,6 +133,7 @@ for suite in ${SUITES}; do
     -v HA_PROXY_IP:$ODL_SYSTEM_IP \
     -v JDKVERSION:${JDKVERSION} \
     -v JENKINS_WORKSPACE:${WORKSPACE} \
+    -v KARAF_LOG:/opt/opendaylight/data/log/karaf.log \
     -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
     -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
     -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} \
@@ -164,6 +154,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