Skip to content

[CI] issue: 4684071Terminate Valgrind gracefully #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −17
Open

[CI] issue: 4684071Terminate Valgrind gracefully #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .ci/matrix_job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion contrib/jenkins_tests/vg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down