summaryrefslogtreecommitdiffstats
path: root/.gitlab/ci/debian.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci/debian.yml')
-rw-r--r--.gitlab/ci/debian.yml50
1 files changed, 46 insertions, 4 deletions
diff --git a/.gitlab/ci/debian.yml b/.gitlab/ci/debian.yml
index fad9d97..6a17533 100644
--- a/.gitlab/ci/debian.yml
+++ b/.gitlab/ci/debian.yml
@@ -2,16 +2,17 @@
extends:
- .dump_kernel_log
before_script:
+ - sudo apt-get -y update
- >
[ -z "$RUN_SYSTEMD_PLUGIN_TEST" ] ||
sudo apt-get -y install -y -qq swtpm meson ninja-build python3-jinja2
- gperf libcap-dev tpm2-tss-engine-dev libmount-dev swtpm-tools
+ gperf libcap-dev libtss2-dev libmount-dev swtpm-tools
- >
sudo apt-get -y install -y -qq git gcc make autoconf automake autopoint
pkgconf libtool libtool-bin gettext libssl-dev libdevmapper-dev
libpopt-dev uuid-dev libsepol-dev libjson-c-dev libssh-dev libblkid-dev
tar libargon2-0-dev libpwquality-dev sharutils dmsetup jq xxd expect
- keyutils netcat passwd openssh-client sshpass asciidoctor
+ keyutils netcat-openbsd passwd openssh-client sshpass asciidoctor
- sudo apt-get -y build-dep cryptsetup
- sudo -E git clean -xdf
- ./autogen.sh
@@ -22,7 +23,7 @@ test-mergerq-job-debian:
- .debian-prep
tags:
- libvirt
- - debian11
+ - debian12
stage: test
interruptible: true
variables:
@@ -41,7 +42,7 @@ test-main-commit-job-debian:
- .debian-prep
tags:
- libvirt
- - debian11
+ - debian12
stage: test
interruptible: true
variables:
@@ -54,3 +55,44 @@ test-main-commit-job-debian:
- make -j
- make -j -C tests check-programs
- sudo -E make check
+
+# meson tests
+test-mergerq-job-debian-meson:
+ extends:
+ - .debian-prep
+ tags:
+ - libvirt
+ - debian12
+ stage: test
+ interruptible: true
+ variables:
+ RUN_SSH_PLUGIN_TEST: "1"
+ rules:
+ - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+ when: never
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ script:
+ - sudo apt-get -y install -y -qq meson ninja-build
+ - meson setup build
+ - ninja -C build
+ - cd build && sudo -E meson test --verbose --print-errorlogs
+
+test-main-commit-job-debian-meson:
+ extends:
+ - .debian-prep
+ tags:
+ - libvirt
+ - debian12
+ stage: test
+ interruptible: true
+ variables:
+ RUN_SSH_PLUGIN_TEST: "1"
+ rules:
+ - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+ when: never
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
+ script:
+ - sudo apt-get -y install -y -qq meson ninja-build
+ - meson setup build
+ - ninja -C build
+ - cd build && sudo -E meson test --verbose --print-errorlogs