From 8d99ce28e8e7d6198c020aff0fc5fef00515307b Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 16 May 2024 12:29:49 +0200
Subject: [PATCH 1/3] Revert "Allow failure of cross-version-config test"

This reverts commit b99cdfab9d012bce63dff8463eae87772034138a.
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c67ef24f0..0e7dc3b0f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -720,7 +720,6 @@ cross-version-config-tests:
     untracked: true
     expire_in: "1 day"
     when: always
-  allow_failure: true  # pytest env variable refactoring
 
 # Jobs for regular GCC builds on Alpine Linux 3.20 (amd64)
 

From e712cf613f483646151b41b2325070273a205795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= <nicki@isc.org>
Date: Fri, 24 May 2024 11:00:09 +0200
Subject: [PATCH 2/3] Fix oversight in cross-version-config test

This is a followup for 5e7b3d9ef36b199e2d24d385593a8e2f7d541b65. The
change slipped by during refactoring and this line wasn't updated.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e7dc3b0f8..0be298f80f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -703,7 +703,7 @@ cross-version-config-tests:
     # release using the binaries built for the current BIND 9 version.  This
     # intends to detect obvious backward compatibility issues with the latter.
     - >
-      sed -i -E "s|(\s* \"TOP_BUILDDIR\"):.*|\1: \"${CI_PROJECT_DIR}\",|" isctest/vars/autoconf.py
+      echo "${CI_PROJECT_DIR}" > isctest/vars/.ac_vars/TOP_BUILDDIR
     - >
       "$PYTEST" --setup-only --junit-xml="$CI_PROJECT_DIR"/junit.xml -n "${TEST_PARALLEL_JOBS:-1}"
   needs:

From c58dd6e78f9c69667f0abb71d4c162a479a87029 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 16 May 2024 12:36:34 +0200
Subject: [PATCH 3/3] Workaround temporary cross-version-config-tests
 limitation

The system test from the BIND 9.19.24 release does not include the
isctest/vars/autoconf.py file from 9.19.25-dev, and therefore the job
will fail before the 9.19.25 release is published. In the meantime,
consider using the conf.sh file.
---
 .gitlab-ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0be298f80f..f9d8405955 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -688,6 +688,7 @@ cross-version-config-tests:
     # Disable option checking to prevent problems with new default options in
     # the &configure anchor.
     EXTRA_CONFIGURE: "--disable-option-checking"
+    PYTEST: "/usr/bin/pytest-3"
   script:
     - *configure
     - *setup_interfaces
@@ -697,13 +698,16 @@ cross-version-config-tests:
     - autoreconf -fi
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1}
-    - *find_pytest
     - cd bin/tests/system
     # Run the setup phase of all system tests in the most recently tagged BIND 9
     # release using the binaries built for the current BIND 9 version.  This
     # intends to detect obvious backward compatibility issues with the latter.
     - >
-      echo "${CI_PROJECT_DIR}" > isctest/vars/.ac_vars/TOP_BUILDDIR
+      if [ -f isctest/vars/autoconf.py ]; then
+        echo "${CI_PROJECT_DIR}" > isctest/vars/.ac_vars/TOP_BUILDDIR
+      else
+        sed -i -E "s|(export TOP_BUILDDIR)=.*|\1=${CI_PROJECT_DIR}|" conf.sh;
+      fi
     - >
       "$PYTEST" --setup-only --junit-xml="$CI_PROJECT_DIR"/junit.xml -n "${TEST_PARALLEL_JOBS:-1}"
   needs: