eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI: fix improper distro specification for 32-bit Debian.

Browse Source 
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.
This commit is contained in:
Daniel Zatovic
2024-02-22 16:11:21 +01:00
parent af35c93332
commit 0725efefa7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab/ci/debian-i686.yml
View File

@@ -1,6 +1,4 @@
test-mergerq-job-debian-i686: test-mergerq-job-debian-i686:
variables:
DISTRO: cryptsetup-debian-12i686
extends: extends:
- .debian-prep - .debian-prep
tags: tags:
@@ -9,6 +7,7 @@ test-mergerq-job-debian-i686:
stage: test stage: test
interruptible: true interruptible: true
variables: variables:
DISTRO: cryptsetup-debian-12i686
RUN_SSH_PLUGIN_TEST: "1" RUN_SSH_PLUGIN_TEST: "1"
rules: rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null - if: $RUN_SYSTEMD_PLUGIN_TEST != null
@@ -22,8 +21,6 @@ test-mergerq-job-debian-i686:
- sudo -E make check - sudo -E make check
test-main-commit-job-debian-i686: test-main-commit-job-debian-i686:
variables:
DISTRO: cryptsetup-debian-12i686
extends: extends:
- .debian-prep - .debian-prep
tags: tags:
@@ -32,6 +29,7 @@ test-main-commit-job-debian-i686:
stage: test stage: test
interruptible: true interruptible: true
variables: variables:
DISTRO: cryptsetup-debian-12i686
RUN_SSH_PLUGIN_TEST: "1" RUN_SSH_PLUGIN_TEST: "1"
rules: rules:
- if: $RUN_SYSTEMD_PLUGIN_TEST != null - if: $RUN_SYSTEMD_PLUGIN_TEST != null

6
.gitlab/ci/debian.yml
View File

@@ -1,8 +1,6 @@
.debian-prep: .debian-prep:
extends: extends:
- .fail_if_coredump_generated - .fail_if_coredump_generated
variables:
DISTRO: cryptsetup-debian-12
before_script: before_script:
- sudo apt-get -y update - sudo apt-get -y update
- > - >
@@ -29,6 +27,7 @@ test-mergerq-job-debian:
stage: test stage: test
interruptible: true interruptible: true
variables: variables:
DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1" RUN_SSH_PLUGIN_TEST: "1"
rules: rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
@@ -48,6 +47,7 @@ test-main-commit-job-debian:
stage: test stage: test
interruptible: true interruptible: true
variables: variables:
DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1" RUN_SSH_PLUGIN_TEST: "1"
rules: rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
@@ -68,6 +68,7 @@ test-mergerq-job-debian-meson:
stage: test stage: test
interruptible: true interruptible: true
variables: variables:
DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1" RUN_SSH_PLUGIN_TEST: "1"
rules: rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
@@ -88,6 +89,7 @@ test-main-commit-job-debian-meson:
stage: test stage: test
interruptible: true interruptible: true
variables: variables:
DISTRO: cryptsetup-debian-12
RUN_SSH_PLUGIN_TEST: "1" RUN_SSH_PLUGIN_TEST: "1"
rules: rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"