X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-apex-run-tests.sh;h=14f9f4a8a613d4c3adbcd7aaf631709e52c04edf;hb=923224801df212827c0f80f670904370f0a346bf;hp=7b7d128fbd83861be7d8dbca51fe3f84b897580a;hpb=3f74d54d316d9ee1648aa645be5dc71fe5b6cfa3;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh index 7b7d128fb..14f9f4a8a 100644 --- 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 \