diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e2a2c31fb..33333549b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2022-03-15.0-1c8fb45999e9' - UBUNTU_TAG: '2022-03-15.0-f7d56c5dcd47' - DEBIAN_TAG: '2022-03-15.0-f7d56c5dcd47' - CENTOS_TAG: '2022-03-15.0-1c8fb45999e9' - ALPINE_TAG: '2022-03-15.0-91803105505b' + FEDORA_TAG: '2022-03-15.0-fb4fc6b5dff6' + UBUNTU_TAG: '2022-03-15.0-6b7641ec0d2b' + DEBIAN_TAG: '2022-03-15.0-6b7641ec0d2b' + CENTOS_TAG: '2022-03-15.0-fb4fc6b5dff6' + ALPINE_TAG: '2022-03-15.0-f6b3036d4e95' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -622,6 +622,7 @@ alpine:latest@container-clean: .build@template: stage: test script: + - env - .gitlab-ci/run-test.sh dependencies: [] diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 9e6a2c1790..4629c7effe 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -144,6 +144,7 @@ variables: .build@template: stage: test script: + - env - .gitlab-ci/run-test.sh dependencies: [] diff --git a/.gitlab-ci/run-test.sh b/.gitlab-ci/run-test.sh index a183aa1f07..c826dd078b 100755 --- a/.gitlab-ci/run-test.sh +++ b/.gitlab-ci/run-test.sh @@ -15,7 +15,6 @@ do_clean() { uname -a ! command -v locale &>/dev/null || locale -a -env meson --version ! command -v dpkg &>/dev/null || dpkg -l