diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e4d87468bca0e3c956a7bdaee5c775332425944..1494f2ccf5d8498df839f388e79d2facc882c98c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,6 +75,7 @@ test:comparative:kresd: # compare results from latest Deckard with results from merge base - cp ci/common.sh /tmp - cp ci/compare-tests.sh /tmp + - cp ci/junit-compare.py /tmp - LD_LIBRARY_PATH=/tmp/.local/lib PATH=/tmp/.local/sbin:$PATH /tmp/compare-tests.sh $(pwd)/kresd_run.sh artifacts: when: always diff --git a/ci/compare-tests.sh b/ci/compare-tests.sh index d7cff6c2b78d299abe8775b38a28cda724eae6f2..63d8c6766e170d12b42462f29a2b758323e40d76 100755 --- a/ci/compare-tests.sh +++ b/ci/compare-tests.sh @@ -17,6 +17,8 @@ function find_modified_tests { MODIFIED_TESTS_FILE="/tmp/modified_tests" find_modified_tests LOGS[0]="${MODIFIED_TESTS_FILE}" +LOGS[1]="/tmp/base.xml" +LOGS[2]="/tmp/head.xml" : get test results from version under test "${TESTRUNNER}" -n $(nproc) --junit-xml=/tmp/head.xml || : some tests on HEAD ${HEAD} failed @@ -25,4 +27,4 @@ LOGS[0]="${MODIFIED_TESTS_FILE}" git checkout --force --detach "${MERGEBASE}" git clean -xdf "${TESTRUNNER}" -n $(nproc) --junit-xml=/tmp/base.xml || : some tests on merge base ${MERGEBASE} failed -"${CIDIR}/junit_compare.py" /tmp/head.xml /tmp/base.xml /tmp/modified_tests && echo "OK, no differences found" +"${CIDIR}/junit-compare.py" /tmp/head.xml /tmp/base.xml /tmp/modified_tests && echo "OK, no differences found" diff --git a/ci/junit_compare.py b/ci/junit-compare.py similarity index 100% rename from ci/junit_compare.py rename to ci/junit-compare.py