From 4cec2feca335377f3b8e4aa448f8997760f5fb64 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 19 Sep 2023 08:53:27 -0400
Subject: [PATCH] gitlab-ci: Mark T22012 as broken on CentOS 7
Due to #23979.
---
.gitlab/generate-ci/gen_ci.hs | 3 ++-
.gitlab/jobs.yaml | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab/generate-ci/gen_ci.hs b/.gitlab/generate-ci/gen_ci.hs
index 30230a9dfec5..e9952f6ae7ea 100644
--- a/.gitlab/generate-ci/gen_ci.hs
+++ b/.gitlab/generate-ci/gen_ci.hs
@@ -447,7 +447,8 @@ distroVariables :: LinuxDistro -> Variables
distroVariables Alpine312 = alpineVariables
distroVariables Alpine318 = alpineVariables
distroVariables Centos7 = mconcat [
- "HADRIAN_ARGS" =: "--docs=no-sphinx"
+ "HADRIAN_ARGS" =: "--docs=no-sphinx"
+ , "BROKEN_TESTS" =: "T22012" -- due to #23979
]
distroVariables Rocky8 = mconcat [
"HADRIAN_ARGS" =: "--docs=no-sphinx"
diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml
index 43950ecc9a9b..813992337da9 100644
--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -1141,6 +1141,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-centos7-validate",
+ "BROKEN_TESTS": "T22012",
"BUILD_FLAVOUR": "validate",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"HADRIAN_ARGS": "--docs=no-sphinx",
@@ -3301,6 +3302,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-centos7-release+no_split_sections",
+ "BROKEN_TESTS": "T22012",
"BUILD_FLAVOUR": "release+no_split_sections",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx",
--
GitLab