diff options
author | Daniel Zatovic <daniel.zatovic@gmail.com> | 2023-10-13 11:09:39 +0200 |
---|---|---|
committer | Milan Broz <gmazyland@gmail.com> | 2024-02-22 11:41:37 +0000 |
commit | f8e79cdbe687c03ceab824b04b4b161971a368c0 (patch) | |
tree | 51239db7714ef44f69729e20b39c54fc4bf69357 | |
parent | 35cd898c63490fd9803985e59099a9db3b9d43c3 (diff) | |
download | cryptsetup-f8e79cdbe687c03ceab824b04b4b161971a368c0.tar.gz |
CI: update jobs for new CI infrastrucure
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/ci/alpinelinux.yml | 10 | ||||
-rw-r--r-- | .gitlab/ci/annocheck.yml | 3 | ||||
-rw-r--r-- | .gitlab/ci/centos.yml | 6 | ||||
-rw-r--r-- | .gitlab/ci/csmock.yml | 3 | ||||
-rw-r--r-- | .gitlab/ci/debian-i686.yml (renamed from .gitlab/ci/ubuntu-32bit.yml) | 12 | ||||
-rw-r--r-- | .gitlab/ci/debian.yml | 12 | ||||
-rw-r--r-- | .gitlab/ci/fedora.yml | 6 | ||||
-rw-r--r-- | .gitlab/ci/rhel.yml | 12 |
9 files changed, 41 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31531459..ff195b8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,5 +19,5 @@ include: - local: .gitlab/ci/compilation-gcc.gitlab-ci.yml - local: .gitlab/ci/compilation-clang.gitlab-ci.yml - local: .gitlab/ci/alpinelinux.yml - - local: .gitlab/ci/ubuntu-32bit.yml + - local: .gitlab/ci/debian-i686.yml - local: .gitlab/ci/cifuzz.yml diff --git a/.gitlab/ci/alpinelinux.yml b/.gitlab/ci/alpinelinux.yml index 81bd6cbf..ef7081c5 100644 --- a/.gitlab/ci/alpinelinux.yml +++ b/.gitlab/ci/alpinelinux.yml @@ -1,12 +1,12 @@ .alpinelinux-dependencies: + variables: + DISTRO: cryptsetup-alpine-edge after_script: - - sudo dmesg > /mnt/artifacts/dmesg.log - - sudo cp /var/log/messages /mnt/artifacts/ - '[ "$(ls -A /var/coredumps)" ] && exit 1 || true' 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 7501180a..bf2c4b99 100644 --- a/.gitlab/ci/annocheck.yml +++ b/.gitlab/ci/annocheck.yml @@ -3,11 +3,12 @@ test-main-commit-job-annocheck: - .dump_kernel_log 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 6f5559c5..c4ed654a 100644 --- a/.gitlab/ci/centos.yml +++ b/.gitlab/ci/centos.yml @@ -1,4 +1,6 @@ .centos-openssl-backend: + variables: + DISTRO: cryptsetup-centos-stream-9 extends: - .dump_kernel_log before_script: @@ -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 a1cd9853..a749eaa3 100644 --- a/.gitlab/ci/csmock.yml +++ b/.gitlab/ci/csmock.yml @@ -3,11 +3,12 @@ test-commit-job-csmock: - .dump_kernel_log tags: - libvirt - - rhel9-csmock + - 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/ubuntu-32bit.yml b/.gitlab/ci/debian-i686.yml index f51c059c..76ba5d7a 100644 --- a/.gitlab/ci/ubuntu-32bit.yml +++ b/.gitlab/ci/debian-i686.yml @@ -1,9 +1,11 @@ -test-mergerq-job-ubuntu-32bit: +test-mergerq-job-debian-i686: + variables: + DISTRO: cryptsetup-debian-12i686 extends: - .debian-prep tags: - libvirt - - ubuntu-bionic-32bit + - cryptsetup-debian-12i686 stage: test interruptible: true variables: @@ -19,12 +21,14 @@ 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: + variables: + DISTRO: cryptsetup-debian-12i686 extends: - .debian-prep tags: - libvirt - - ubuntu-bionic-32bit + - cryptsetup-debian-12i686 stage: test interruptible: true variables: diff --git a/.gitlab/ci/debian.yml b/.gitlab/ci/debian.yml index 6a17533f..964c0473 100644 --- a/.gitlab/ci/debian.yml +++ b/.gitlab/ci/debian.yml @@ -1,6 +1,8 @@ .debian-prep: extends: - .dump_kernel_log + variables: + DISTRO: cryptsetup-debian-12 before_script: - sudo apt-get -y update - > @@ -11,7 +13,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,7 +25,7 @@ test-mergerq-job-debian: - .debian-prep tags: - libvirt - - debian12 + - cryptsetup-debian-12 stage: test interruptible: true variables: @@ -42,7 +44,7 @@ test-main-commit-job-debian: - .debian-prep tags: - libvirt - - debian12 + - cryptsetup-debian-12 stage: test interruptible: true variables: @@ -62,7 +64,7 @@ test-mergerq-job-debian-meson: - .debian-prep tags: - libvirt - - debian12 + - cryptsetup-debian-12 stage: test interruptible: true variables: @@ -82,7 +84,7 @@ test-main-commit-job-debian-meson: - .debian-prep tags: - libvirt - - debian12 + - cryptsetup-debian-12 stage: test interruptible: true variables: diff --git a/.gitlab/ci/fedora.yml b/.gitlab/ci/fedora.yml index 7fd9c7e7..6501d2e7 100644 --- a/.gitlab/ci/fedora.yml +++ b/.gitlab/ci/fedora.yml @@ -1,4 +1,6 @@ .dnf-openssl-backend: + variables: + DISTRO: cryptsetup-fedora-rawhide extends: - .dump_kernel_log before_script: @@ -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 f71533cd..17f4c344 100644 --- a/.gitlab/ci/rhel.yml +++ b/.gitlab/ci/rhel.yml @@ -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 |