diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index adeb82d10b..90b2b9d834 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -993,7 +993,6 @@ unit:gcc:almalinux8:amd64: needs: - job: gcc:almalinux8:amd64 artifacts: true - allow_failure: true # remove once GL#5448 is fixed # Jobs for regular GCC builds on Alma Linux 9 (amd64) diff --git a/tests/isc/meson.build b/tests/isc/meson.build index 55eb7e8129..0b4254c8cc 100644 --- a/tests/isc/meson.build +++ b/tests/isc/meson.build @@ -60,7 +60,9 @@ flaky_isc_test = [ 'proxystream', ] -if config.has('HAVE_LIBNGHTTP2') +is_el8 = run_command('grep', '-q', '-F', 'platform:el8', '/etc/os-release', check: false).returncode() == 0 + +if config.has('HAVE_LIBNGHTTP2') and not is_el8 isc_test += 'doh' endif