diff --git a/.ci/matrix_job.yaml b/.ci/matrix_job.yaml index 7f494382a..f73791754 100644 --- a/.ci/matrix_job.yaml +++ b/.ci/matrix_job.yaml @@ -198,6 +198,22 @@ steps: jenkins/**/arch-*.tar.gz, jenkins/**/output/errors/**/*.html + - name: Valgrind + enable: ${do_valgrind} + containerSelector: + - "{name: 'skip-container'}" + agentSelector: + - "{nodeLabel: 'beni09', variant:1}" + run: | + [ "x${do_valgrind}" == "xtrue" ] && action=yes || action=no + env WORKSPACE=$PWD TARGET=${flags} jenkins_test_vg=${action} ./contrib/test_jenkins.sh + parallel: false + onfail: | + ./.ci/artifacts.sh + archiveArtifacts-onfail: | + jenkins/**/arch-*.tar.gz, + jenkins/**/vg/*valgrind*.log + - name: Cppcheck enable: ${do_cppcheck} containerSelector: @@ -260,22 +276,6 @@ steps: archiveJunit-onfail: | jenkins/**/*.xml - - name: Valgrind - enable: ${do_valgrind} - containerSelector: - - "{name: 'skip-container'}" - agentSelector: - - "{nodeLabel: 'beni09', variant:1}" - run: | - [ "x${do_valgrind}" == "xtrue" ] && action=yes || action=no - env WORKSPACE=$PWD TARGET=${flags} jenkins_test_vg=${action} ./contrib/test_jenkins.sh - parallel: false - onfail: | - ./.ci/artifacts.sh - archiveArtifacts-onfail: | - jenkins/**/arch-*.tar.gz, - jenkins/**/vg/*valgrind*.log - - name: Commit enable: ${do_commit} containerSelector: diff --git a/contrib/jenkins_tests/vg.sh b/contrib/jenkins_tests/vg.sh index af4c4c9b8..1023abae5 100755 --- a/contrib/jenkins_tests/vg.sh +++ b/contrib/jenkins_tests/vg.sh @@ -95,7 +95,7 @@ for test_link in $test_ip_list; do if [ `ps -ef | grep $test_app | wc -l` -gt 1 ]; then - ${sudo_cmd} pkill -9 -f $test_app 2>/dev/null || true + ${sudo_cmd} pkill -SIGINT -f $test_app 2>/dev/null || true sleep 10 # in case SIGINT didn't work if [ `ps -ef | grep $test_app | wc -l` -gt 1 ];