diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-19 08:42:15 +1000 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2020-02-19 08:03:30 +0000 |
| commit | 1954523309e3a26af1f76537021c69b30dbdc0c9 (patch) | |
| tree | 92a61680cf017f66b2875d0df0b4f40a1cd54cdd | |
| parent | 337ab84599240139936fa204e43ff30623d06ad2 (diff) | |
| download | libinput-1954523309e3a26af1f76537021c69b30dbdc0c9.tar.gz | |
gitlab CI: handling killing the qemu process better
If qemu has already shut down by the time we call kill, pgrep returns nothing
and we fail the script. Let's not do that. And let's replace kill pgrep with
just pkill in the process.
Let's get rid of the after_script part too, gitlab kills any process started
in the main script anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fd0d171..a8509a50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -509,17 +509,12 @@ freebsd:11.2@container-clean: - ssh localhost -p 5555 halt || true - sleep 2 - - kill $(pgrep qemu) + - pkill qemu || true - if [[ ! -e .success ]] ; then exit 1 ; fi - - after_script: - # no matter the results of the tests, we want to kill the VM - - kill $(pgrep qemu) - artifacts: name: "qemu-meson-logs-$CI_JOB_NAME" when: always |