summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/alpinelinux.yml14
-rw-r--r--.gitlab/ci/annocheck.yml5
-rw-r--r--.gitlab/ci/centos.yml8
-rw-r--r--.gitlab/ci/csmock.yml6
-rw-r--r--.gitlab/ci/debian-i686.yml (renamed from .gitlab/ci/ubuntu-32bit.yml)10
-rw-r--r--.gitlab/ci/debian.yml16
-rw-r--r--.gitlab/ci/fedora-opal.yml134
-rw-r--r--.gitlab/ci/fedora.yml8
-rw-r--r--.gitlab/ci/rhel.yml14
-rw-r--r--.gitlab/issue_templates/Bug.md3
10 files changed, 186 insertions, 32 deletions
diff --git a/.gitlab/ci/alpinelinux.yml b/.gitlab/ci/alpinelinux.yml
index 81bd6cb..d867f2f 100644
--- a/.gitlab/ci/alpinelinux.yml
+++ b/.gitlab/ci/alpinelinux.yml
@@ -1,12 +1,12 @@
.alpinelinux-dependencies:
- after_script:
- - sudo dmesg > /mnt/artifacts/dmesg.log
- - sudo cp /var/log/messages /mnt/artifacts/
- - '[ "$(ls -A /var/coredumps)" ] && exit 1 || true'
+ variables:
+ DISTRO: cryptsetup-alpine-edge
+ extends:
+ - .fail_if_coredump_generated
before_script:
- >
sudo apk add
- lvm2-dev openssl1.1-compat-dev popt-dev util-linux-dev json-c-dev
+ lvm2-dev openssl-dev popt-dev util-linux-dev json-c-dev
argon2-dev device-mapper which sharutils gettext gettext-dev automake
autoconf libtool build-base keyutils tar jq expect git asciidoctor
- ./autogen.sh
@@ -17,7 +17,7 @@ test-main-commit-job-alpinelinux:
- .alpinelinux-dependencies
tags:
- libvirt
- - alpinelinux
+ - cryptsetup-alpine-edge
stage: test
interruptible: true
variables:
@@ -38,7 +38,7 @@ test-mergerq-job-alpinelinux:
- .alpinelinux-dependencies
tags:
- libvirt
- - alpinelinux
+ - cryptsetup-alpine-edge
stage: test
interruptible: true
variables:
diff --git a/.gitlab/ci/annocheck.yml b/.gitlab/ci/annocheck.yml
index 7501180..8d12dfb 100644
--- a/.gitlab/ci/annocheck.yml
+++ b/.gitlab/ci/annocheck.yml
@@ -1,13 +1,14 @@
test-main-commit-job-annocheck:
extends:
- - .dump_kernel_log
+ - .fail_if_coredump_generated
tags:
- libvirt
- - rhel9-annocheck
+ - cryptsetup-rhel-9
stage: test
interruptible: true
allow_failure: true
variables:
+ DISTRO: cryptsetup-rhel-9
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
diff --git a/.gitlab/ci/centos.yml b/.gitlab/ci/centos.yml
index 6f5559c..1fa13ff 100644
--- a/.gitlab/ci/centos.yml
+++ b/.gitlab/ci/centos.yml
@@ -1,6 +1,8 @@
.centos-openssl-backend:
+ variables:
+ DISTRO: cryptsetup-centos-stream-9
extends:
- - .dump_kernel_log
+ - .fail_if_coredump_generated
before_script:
- >
sudo dnf -y -q install
@@ -21,7 +23,7 @@ test-main-commit-centos-stream9:
- .centos-openssl-backend
tags:
- libvirt
- - centos-stream9
+ - cryptsetup-centos-stream-9
stage: test
interruptible: true
variables:
@@ -42,7 +44,7 @@ test-mergerq-centos-stream9:
- .centos-openssl-backend
tags:
- libvirt
- - centos-stream9
+ - cryptsetup-centos-stream-9
stage: test
interruptible: true
variables:
diff --git a/.gitlab/ci/csmock.yml b/.gitlab/ci/csmock.yml
index a1cd985..76c390e 100644
--- a/.gitlab/ci/csmock.yml
+++ b/.gitlab/ci/csmock.yml
@@ -1,14 +1,16 @@
test-commit-job-csmock:
extends:
- - .dump_kernel_log
+ - .fail_if_coredump_generated
tags:
- libvirt
- - rhel9-csmock
+ - cryptsetup-rhel-9
stage: test
interruptible: true
allow_failure: true
variables:
+ DISTRO: cryptsetup-rhel-9
RUN_SSH_PLUGIN_TEST: "1"
+ DISK_SIZE: 20
rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
when: never
diff --git a/.gitlab/ci/ubuntu-32bit.yml b/.gitlab/ci/debian-i686.yml
index f51c059..09db9e0 100644
--- a/.gitlab/ci/ubuntu-32bit.yml
+++ b/.gitlab/ci/debian-i686.yml
@@ -1,12 +1,13 @@
-test-mergerq-job-ubuntu-32bit:
+test-mergerq-job-debian-i686:
extends:
- .debian-prep
tags:
- libvirt
- - ubuntu-bionic-32bit
+ - cryptsetup-debian-12i686
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-debian-12i686
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null
@@ -19,15 +20,16 @@ test-mergerq-job-ubuntu-32bit:
- make -j -C tests check-programs
- sudo -E make check
-test-main-commit-job-ubuntu-32bit:
+test-main-commit-job-debian-i686:
extends:
- .debian-prep
tags:
- libvirt
- - ubuntu-bionic-32bit
+ - cryptsetup-debian-12i686
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-debian-12i686
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null
diff --git a/.gitlab/ci/debian.yml b/.gitlab/ci/debian.yml
index 6a17533..847feb8 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
before_script:
- sudo apt-get -y update
- >
@@ -11,7 +11,7 @@
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
+ tar libargon2-dev libpwquality-dev sharutils dmsetup jq xxd expect
keyutils netcat-openbsd passwd openssh-client sshpass asciidoctor
- sudo apt-get -y build-dep cryptsetup
- sudo -E git clean -xdf
@@ -23,10 +23,11 @@ test-mergerq-job-debian:
- .debian-prep
tags:
- libvirt
- - debian12
+ - cryptsetup-debian-12
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
@@ -42,10 +43,11 @@ test-main-commit-job-debian:
- .debian-prep
tags:
- libvirt
- - debian12
+ - cryptsetup-debian-12
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
@@ -62,10 +64,11 @@ test-mergerq-job-debian-meson:
- .debian-prep
tags:
- libvirt
- - debian12
+ - cryptsetup-debian-12
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
@@ -82,10 +85,11 @@ test-main-commit-job-debian-meson:
- .debian-prep
tags:
- libvirt
- - debian12
+ - cryptsetup-debian-12
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
diff --git a/.gitlab/ci/fedora-opal.yml b/.gitlab/ci/fedora-opal.yml
new file mode 100644
index 0000000..c92ca43
--- /dev/null
+++ b/.gitlab/ci/fedora-opal.yml
@@ -0,0 +1,134 @@
+.dnf-openssl-backend:
+ variables:
+ DISTRO: cryptsetup-fedora-rawhide
+ extends:
+ - .fail_if_coredump_generated
+ before_script:
+ - >
+ [ -z "$RUN_SYSTEMD_PLUGIN_TEST" ] ||
+ sudo dnf -y -q install
+ swtpm meson ninja-build python3-jinja2 gperf libcap-devel tpm2-tss-devel
+ libmount-devel swtpm-tools
+ - >
+ sudo dnf -y -q install
+ autoconf automake device-mapper-devel gcc gettext-devel json-c-devel
+ libargon2-devel libblkid-devel libpwquality-devel libselinux-devel
+ libssh-devel libtool libuuid-devel make popt-devel
+ libsepol-devel.x86_64 netcat openssh-clients passwd pkgconfig sharutils
+ sshpass tar uuid-devel vim-common device-mapper expect gettext git jq
+ keyutils openssl-devel openssl asciidoctor
+ - sudo -E git clean -xdf
+ - ./autogen.sh
+ - ./configure --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --enable-asciidoc
+
+.opal-template-fedora:
+ extends:
+ - .dnf-openssl-backend
+ tags:
+ - libvirt
+ - cryptsetup-fedora-rawhide
+ stage: test
+ interruptible: true
+ variables:
+ OPAL2_DEV: "/dev/nvme0n1"
+ OPAL2_PSID_FILE: "/home/gitlab-runner/psid.txt"
+ VOLATILE: 1
+ script:
+ - sudo dnf install -y -q nvme-cli
+ - sudo nvme list
+ - make -j
+ - make -j -C tests check-programs
+ - sudo -E make check TESTS="00modules-test compat-test-opal"
+
+# Samsung SSD 980 500GB (on tiber machine)
+test-commit-rawhide-samsung980:
+ rules:
+ - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+ when: never
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
+ extends:
+ - .opal-template-fedora
+ tags:
+ - tiber
+ stage: test
+ interruptible: true
+ variables:
+ PCI_PASSTHROUGH_VENDOR_ID: "144d"
+ PCI_PASSTHROUGH_DEVICE_ID: "a809"
+
+test-mergerq-rawhide-samsung980:
+ rules:
+ - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+ when: never
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ extends:
+ - .opal-template-fedora
+ tags:
+ - tiber
+ stage: test
+ interruptible: true
+ variables:
+ PCI_PASSTHROUGH_VENDOR_ID: "144d"
+ PCI_PASSTHROUGH_DEVICE_ID: "a809"
+
+# # WD PC SN740 SDDQNQD-512G-1014 (on tiber machine)
+# test-commit-rawhide-sn740:
+# rules:
+# - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+# when: never
+# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
+# extends:
+# - .opal-template-fedora
+# tags:
+# - tiber
+# stage: test
+# interruptible: true
+# variables:
+# PCI_PASSTHROUGH_VENDOR_ID: "15b7"
+# PCI_PASSTHROUGH_DEVICE_ID: "5017"
+#
+# test-mergerq-rawhide-sn740:
+# rules:
+# - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+# when: never
+# - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+# extends:
+# - .opal-template-fedora
+# tags:
+# - tiber
+# stage: test
+# interruptible: true
+# variables:
+# PCI_PASSTHROUGH_VENDOR_ID: "15b7"
+# PCI_PASSTHROUGH_DEVICE_ID: "5017"
+#
+# # UMIS RPETJ256MGE2MDQ (on tiber machine)
+# test-commit-rawhide-umis:
+# rules:
+# - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+# when: never
+# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
+# extends:
+# - .opal-template-fedora
+# tags:
+# - tiber
+# stage: test
+# interruptible: true
+# variables:
+# PCI_PASSTHROUGH_VENDOR_ID: "1cc4"
+# PCI_PASSTHROUGH_DEVICE_ID: "6302"
+#
+# test-mergerq-rawhide-umis:
+# rules:
+# - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
+# when: never
+# - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+# extends:
+# - .opal-template-fedora
+# tags:
+# - tiber
+# stage: test
+# interruptible: true
+# variables:
+# PCI_PASSTHROUGH_VENDOR_ID: "1cc4"
+# PCI_PASSTHROUGH_DEVICE_ID: "6302"
diff --git a/.gitlab/ci/fedora.yml b/.gitlab/ci/fedora.yml
index 7fd9c7e..0d3ade4 100644
--- a/.gitlab/ci/fedora.yml
+++ b/.gitlab/ci/fedora.yml
@@ -1,6 +1,8 @@
.dnf-openssl-backend:
+ variables:
+ DISTRO: cryptsetup-fedora-rawhide
extends:
- - .dump_kernel_log
+ - .fail_if_coredump_generated
before_script:
- >
[ -z "$RUN_SYSTEMD_PLUGIN_TEST" ] ||
@@ -24,7 +26,7 @@ test-main-commit-job-rawhide:
- .dnf-openssl-backend
tags:
- libvirt
- - fedora-rawhide
+ - cryptsetup-fedora-rawhide
stage: test
interruptible: true
allow_failure: true
@@ -44,7 +46,7 @@ test-mergerq-job-rawhide:
- .dnf-openssl-backend
tags:
- libvirt
- - fedora-rawhide
+ - cryptsetup-fedora-rawhide
stage: test
interruptible: true
allow_failure: true
diff --git a/.gitlab/ci/rhel.yml b/.gitlab/ci/rhel.yml
index f71533c..fe9af04 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
@@ -21,10 +21,11 @@ test-main-commit-rhel8:
- .rhel-openssl-backend
tags:
- libvirt
- - rhel8
+ - cryptsetup-rhel-8
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-rhel-8
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null
@@ -42,10 +43,11 @@ test-main-commit-rhel9:
- .rhel-openssl-backend
tags:
- libvirt
- - rhel9
+ - cryptsetup-rhel-9
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-rhel-9
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null
@@ -65,10 +67,11 @@ test-main-commit-rhel8-fips:
- .rhel-openssl-backend
tags:
- libvirt
- - rhel8-fips
+ - cryptsetup-rhel-8-fips
stage: test
interruptible: true
variables:
+ DISTRO: cryptsetup-rhel-8-fips
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null
@@ -87,11 +90,12 @@ test-main-commit-rhel9-fips:
- .rhel-openssl-backend
tags:
- libvirt
- - rhel9-fips
+ - cryptsetup-rhel-9-fips
stage: test
interruptible: true
allow_failure: true
variables:
+ DISTRO: cryptsetup-rhel-9-fips
RUN_SSH_PLUGIN_TEST: "1"
rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index f8837aa..88ad54b 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -9,7 +9,10 @@
### Debug log
<!-- Paste a debug log of the failing command (add --debug option) between the markers below (to keep raw debug format).-->
+<!-- We need a lot of information from the debug log; without it, we cannot process your report. -->
+<!-- Debug log does not contain any private information. Do not paste private data; we'll ask you for more information if needed. -->
```
Output with --debug option:
```
+<!-- NOTE: WITHOUT DEBUG LOG, THE BUG REPORT WILL BE CLOSED. ALSO, PLEASE DO NOT TRY TO REMOVE PARTS OF THE DEBUG LOG! -->
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-29 01:30:46 +0000