Skip to content

Commit

Permalink
CI: make OPAL tests run at the end
Browse files Browse the repository at this point in the history
Once OPAL tests run, the whole pipeline gets marked as uninterruptible
(because of the uninterruptible OPAL job). Therefore a duplicate
pipeline gets started on e.g. MR change. Move OPAL jobs to test-opal
stage which runs at the end.
  • Loading branch information
danzatt authored and mbroz committed May 7, 2024
1 parent 42a073c commit ea32731
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 28 deletions.
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
stages:
- test
- test-opal

.fail_if_coredump_generated:
after_script:
Expand Down
29 changes: 1 addition & 28 deletions .gitlab/ci/fedora-opal.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
.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
stage: test-opal
interruptible: false
variables:
OPAL2_DEV: "/dev/nvme0n1"
Expand All @@ -50,7 +27,6 @@ test-commit-rawhide-samsung980:
- .opal-template-fedora
tags:
- tiber
stage: test
interruptible: false
variables:
PCI_PASSTHROUGH_VENDOR_ID: "144d"
Expand All @@ -65,7 +41,6 @@ test-mergerq-rawhide-samsung980:
- .opal-template-fedora
tags:
- tiber
stage: test
interruptible: false
variables:
PCI_PASSTHROUGH_VENDOR_ID: "144d"
Expand All @@ -81,7 +56,6 @@ test-commit-rawhide-sn740:
- .opal-template-fedora
tags:
- tiber
stage: test
interruptible: false
variables:
PCI_PASSTHROUGH_VENDOR_ID: "15b7"
Expand All @@ -96,7 +70,6 @@ test-mergerq-rawhide-sn740:
- .opal-template-fedora
tags:
- tiber
stage: test
interruptible: false
variables:
PCI_PASSTHROUGH_VENDOR_ID: "15b7"
Expand Down

0 comments on commit ea32731

Please sign in to comment.