From af35c93332403a7125931abf0b6095ab6e7c5e4a Mon Sep 17 00:00:00 2001
From: Daniel Zatovic <daniel.zatovic@gmail.com>
Date: Wed, 24 Jan 2024 13:43:11 +0100
Subject: [PATCH] CI: don't store kernel log, only check for coredumps.

The kernel log is uploaded automatically by the custom executor, no need
to upload it from inside the VM (and /mnt/artifacts is not mounted in
the new CI scripts).
---
 .gitlab-ci.yml             | 4 +---
 .gitlab/ci/alpinelinux.yml | 4 ++--
 .gitlab/ci/annocheck.yml   | 2 +-
 .gitlab/ci/centos.yml      | 2 +-
 .gitlab/ci/csmock.yml      | 2 +-
 .gitlab/ci/debian.yml      | 2 +-
 .gitlab/ci/fedora-opal.yml | 2 +-
 .gitlab/ci/fedora.yml      | 2 +-
 .gitlab/ci/rhel.yml        | 2 +-
 9 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c021336a7..d8d91ab75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,8 @@
 stages:
   - test
 
-.dump_kernel_log:
+.fail_if_coredump_generated:
   after_script:
-    - sudo dmesg > /mnt/artifacts/dmesg.log
-    - sudo journalctl > /mnt/artifacts/journalctl.log
     - '[ "$(ls -A /var/coredumps)" ] && exit 1 || true'
 
 include:
diff --git a/.gitlab/ci/alpinelinux.yml b/.gitlab/ci/alpinelinux.yml
index ef7081c51..d867f2f74 100644
--- a/.gitlab/ci/alpinelinux.yml
+++ b/.gitlab/ci/alpinelinux.yml
@@ -1,8 +1,8 @@
 .alpinelinux-dependencies:
   variables:
     DISTRO: cryptsetup-alpine-edge
-  after_script:
-    - '[ "$(ls -A /var/coredumps)" ] && exit 1 || true'
+  extends:
+    - .fail_if_coredump_generated
   before_script:
     - >
       sudo apk add
diff --git a/.gitlab/ci/annocheck.yml b/.gitlab/ci/annocheck.yml
index bf2c4b99c..8d12dfbda 100644
--- a/.gitlab/ci/annocheck.yml
+++ b/.gitlab/ci/annocheck.yml
@@ -1,6 +1,6 @@
 test-main-commit-job-annocheck:
   extends:
-    - .dump_kernel_log
+    - .fail_if_coredump_generated
   tags:
     - libvirt
     - cryptsetup-rhel-9
diff --git a/.gitlab/ci/centos.yml b/.gitlab/ci/centos.yml
index c4ed654ab..1fa13ffc6 100644
--- a/.gitlab/ci/centos.yml
+++ b/.gitlab/ci/centos.yml
@@ -2,7 +2,7 @@
   variables:
     DISTRO: cryptsetup-centos-stream-9
   extends:
-    - .dump_kernel_log
+    - .fail_if_coredump_generated
   before_script:
     - >
       sudo dnf -y -q  install
diff --git a/.gitlab/ci/csmock.yml b/.gitlab/ci/csmock.yml
index d7713b67d..76c390ee1 100644
--- a/.gitlab/ci/csmock.yml
+++ b/.gitlab/ci/csmock.yml
@@ -1,6 +1,6 @@
 test-commit-job-csmock:
   extends:
-    - .dump_kernel_log
+    - .fail_if_coredump_generated
   tags:
     - libvirt
     - cryptsetup-rhel-9
diff --git a/.gitlab/ci/debian.yml b/.gitlab/ci/debian.yml
index 964c0473d..8330fd4b2 100644
--- a/.gitlab/ci/debian.yml
+++ b/.gitlab/ci/debian.yml
@@ -1,6 +1,6 @@
 .debian-prep:
   extends:
-    - .dump_kernel_log
+    - .fail_if_coredump_generated
   variables:
     DISTRO: cryptsetup-debian-12
   before_script:
diff --git a/.gitlab/ci/fedora-opal.yml b/.gitlab/ci/fedora-opal.yml
index adf07db2a..c92ca4341 100644
--- a/.gitlab/ci/fedora-opal.yml
+++ b/.gitlab/ci/fedora-opal.yml
@@ -2,7 +2,7 @@
   variables:
     DISTRO: cryptsetup-fedora-rawhide
   extends:
-    - .dump_kernel_log
+    - .fail_if_coredump_generated
   before_script:
     - >
       [ -z "$RUN_SYSTEMD_PLUGIN_TEST" ] ||
diff --git a/.gitlab/ci/fedora.yml b/.gitlab/ci/fedora.yml
index 6501d2e7f..0d3ade47b 100644
--- a/.gitlab/ci/fedora.yml
+++ b/.gitlab/ci/fedora.yml
@@ -2,7 +2,7 @@
   variables:
     DISTRO: cryptsetup-fedora-rawhide
   extends:
-    - .dump_kernel_log
+    - .fail_if_coredump_generated
   before_script:
     - >
       [ -z "$RUN_SYSTEMD_PLUGIN_TEST" ] ||
diff --git a/.gitlab/ci/rhel.yml b/.gitlab/ci/rhel.yml
index 17f4c3441..fe9af04b4 100644
--- a/.gitlab/ci/rhel.yml
+++ b/.gitlab/ci/rhel.yml
@@ -1,6 +1,6 @@
 .rhel-openssl-backend:
   extends:
-    - .dump_kernel_log
+    - .fail_if_coredump_generated
   before_script:
     - >
       sudo yum -y -q  install