From: Michał Kępień <michal@isc.org>
Date: Thu, 17 Aug 2023 15:30:37 +0000 (+0200)
Subject: Revert "Exclude dupsigs and keymgr2kasp from cross-version-config-tests"
X-Git-Tag: v9.19.17~48^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96e4139fb8d69bd1421f0fcab5c6457ef25caa26;p=thirdparty%2Fbind9.git

Revert "Exclude dupsigs and keymgr2kasp from cross-version-config-tests"

This reverts commit 4eac32fe231093f5d448c5925654e69099d5da43.

With the v9.19.16 release tag merged, the "cross-version-config-tests"
GitLab CI job will no longer fail due to the two relevant system tests
being absent from the development branch.  This makes the pytest
filtering expression added to work around that issue unnecessary, so
remove it.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee64a1f9f5b..d4110b8fffa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -374,7 +374,7 @@ cross-version-config-tests:
     # intends to detect obvious backward compatibility issues with the latter.
     - sed -i -E "s|(export TOP_BUILDDIR)=.*|\1=${CI_PROJECT_DIR}|" conf.sh
     - >
-      "$PYTEST" --setup-only -n "${TEST_PARALLEL_JOBS:-1}" -k "not dupsigs and not keymgr2kasp"
+      "$PYTEST" --setup-only -n "${TEST_PARALLEL_JOBS:-1}"
   needs:
     - job: autoreconf
       artifacts: true