diff options
| author | Daniel Zatovic <daniel.zatovic@gmail.com> | 2024-02-22 16:11:21 +0100 |
|---|---|---|
| committer | Daniel Zatovic <daniel.zatovic@gmail.com> | 2024-02-22 16:50:46 +0100 |
| commit | 0725efefa7cd0971b2958613f51dc70b99ebed6d (patch) | |
| tree | 4c62199d7ca13e6e7503dcf92937a9bdcd8745de | |
| parent | af35c93332403a7125931abf0b6095ab6e7c5e4a (diff) | |
| download | cryptsetup-0725efefa7cd0971b2958613f51dc70b99ebed6d.tar.gz | |
CI: fix improper distro specification for 32-bit Debian.
The `variables` section is repeated for 32-bit Debian job. Therefore the
`DISTRO` environment variable is ignored and 64-bit distro name is
inherited from the `.debian-prep` job.
| -rw-r--r-- | .gitlab/ci/debian-i686.yml | 6 | ||||
| -rw-r--r-- | .gitlab/ci/debian.yml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/ci/debian-i686.yml b/.gitlab/ci/debian-i686.yml index 76ba5d7a..09db9e06 100644 --- a/.gitlab/ci/debian-i686.yml +++ b/.gitlab/ci/debian-i686.yml @@ -1,6 +1,4 @@ test-mergerq-job-debian-i686: - variables: - DISTRO: cryptsetup-debian-12i686 extends: - .debian-prep tags: @@ -9,6 +7,7 @@ test-mergerq-job-debian-i686: stage: test interruptible: true variables: + DISTRO: cryptsetup-debian-12i686 RUN_SSH_PLUGIN_TEST: "1" rules: - if: $RUN_SYSTEMD_PLUGIN_TEST != null @@ -22,8 +21,6 @@ test-mergerq-job-debian-i686: - sudo -E make check test-main-commit-job-debian-i686: - variables: - DISTRO: cryptsetup-debian-12i686 extends: - .debian-prep tags: @@ -32,6 +29,7 @@ test-main-commit-job-debian-i686: 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 8330fd4b..847feb81 100644 --- a/.gitlab/ci/debian.yml +++ b/.gitlab/ci/debian.yml @@ -1,8 +1,6 @@ .debian-prep: extends: - .fail_if_coredump_generated - variables: - DISTRO: cryptsetup-debian-12 before_script: - sudo apt-get -y update - > @@ -29,6 +27,7 @@ test-mergerq-job-debian: stage: test interruptible: true variables: + DISTRO: cryptsetup-debian-12 RUN_SSH_PLUGIN_TEST: "1" rules: - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" @@ -48,6 +47,7 @@ test-main-commit-job-debian: stage: test interruptible: true variables: + DISTRO: cryptsetup-debian-12 RUN_SSH_PLUGIN_TEST: "1" rules: - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" @@ -68,6 +68,7 @@ test-mergerq-job-debian-meson: stage: test interruptible: true variables: + DISTRO: cryptsetup-debian-12 RUN_SSH_PLUGIN_TEST: "1" rules: - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" @@ -88,6 +89,7 @@ test-main-commit-job-debian-meson: stage: test interruptible: true variables: + DISTRO: cryptsetup-debian-12 RUN_SSH_PLUGIN_TEST: "1" rules: - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" |