Skip to content

Commit ec6f093

Browse files
committed
[CI] issue: 4684071 Terminate Valgrind gracefully
Valgrind today is being terminated with -9 which prevents it from printing all the summaries at the end which are needed for debuging. Change -9 signal to -SIGINT af the first try of shutting down Valgrind Signed-off-by: NirWolfer <[email protected]>
1 parent 3d9baea commit ec6f093

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.ci/matrix_job.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,22 @@ steps:
198198
jenkins/**/arch-*.tar.gz,
199199
jenkins/**/output/errors/**/*.html
200200
201+
- name: Valgrind
202+
enable: ${do_valgrind}
203+
containerSelector:
204+
- "{name: 'skip-container'}"
205+
agentSelector:
206+
- "{nodeLabel: 'beni09', variant:1}"
207+
run: |
208+
[ "x${do_valgrind}" == "xtrue" ] && action=yes || action=no
209+
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_vg=${action} ./contrib/test_jenkins.sh
210+
parallel: false
211+
onfail: |
212+
./.ci/artifacts.sh
213+
archiveArtifacts-onfail: |
214+
jenkins/**/arch-*.tar.gz,
215+
jenkins/**/vg/*valgrind*.log
216+
201217
- name: Cppcheck
202218
enable: ${do_cppcheck}
203219
containerSelector:
@@ -260,22 +276,6 @@ steps:
260276
archiveJunit-onfail: |
261277
jenkins/**/*.xml
262278
263-
- name: Valgrind
264-
enable: ${do_valgrind}
265-
containerSelector:
266-
- "{name: 'skip-container'}"
267-
agentSelector:
268-
- "{nodeLabel: 'beni09', variant:1}"
269-
run: |
270-
[ "x${do_valgrind}" == "xtrue" ] && action=yes || action=no
271-
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_vg=${action} ./contrib/test_jenkins.sh
272-
parallel: false
273-
onfail: |
274-
./.ci/artifacts.sh
275-
archiveArtifacts-onfail: |
276-
jenkins/**/arch-*.tar.gz,
277-
jenkins/**/vg/*valgrind*.log
278-
279279
- name: Commit
280280
enable: ${do_commit}
281281
containerSelector:

contrib/jenkins_tests/vg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ for test_link in $test_ip_list; do
9595

9696
if [ `ps -ef | grep $test_app | wc -l` -gt 1 ];
9797
then
98-
${sudo_cmd} pkill -9 -f $test_app 2>/dev/null || true
98+
${sudo_cmd} pkill -SIGINT -f $test_app 2>/dev/null || true
9999
sleep 10
100100
# in case SIGINT didn't work
101101
if [ `ps -ef | grep $test_app | wc -l` -gt 1 ];

0 commit comments

Comments
 (0)