Move respdiff to Debian "bookworm"

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3594b0d81ae5a3058f687a7d353d4c490947448f..1661dd8321a7e177ad24abb797bac6bd551cdcc7 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,6 +138,10 @@ stages:
   image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64"
   <<: *linux_amd64
 
+.debian-bookworm-amd64: &debian_bookworm_amd64_image
+  image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
+  <<: *linux_amd64
+
 .debian-sid-amd64: &debian_sid_amd64_image
   image: "$CI_REGISTRY_IMAGE:debian-sid-amd64"
   <<: *linux_amd64
@@ -1307,25 +1311,20 @@ coverity:
 # Respdiff tests
 
 respdiff:
-  <<: *base_image
+  <<: *debian_bookworm_amd64_image
   <<: *schedules_tags_web_triggering_rules
   stage: system
   variables:
     CC: gcc
-    CFLAGS: "${CFLAGS_COMMON} -Og"
-    BIND_BASELINE_VERSION: v9_11_24
+    CFLAGS: "${CFLAGS_COMMON} -Og -DOPENSSL_SUPPRESS_DEPRECATED"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.1"
   script:
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} V=1
     - *setup_interfaces
     - git clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.isc.org/isc-private/bind-qa.git
-    - git clone --branch "${BIND_BASELINE_VERSION}" --depth 1 https://gitlab.isc.org/isc-projects/bind9.git refserver
-    - cd refserver/
-    - *configure
-    - make -j${BUILD_PARALLEL_JOBS:-1} V=1
-    - cd ../bind-qa/bind9/respdiff
-    - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "${CI_PROJECT_DIR}/refserver"
+    - cd bind-qa/bind9/respdiff
+    - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named"
   needs: []
   artifacts:
     paths:
@@ -1338,12 +1337,12 @@ respdiff:
     when: always
 
 respdiff-third-party:
-  <<: *base_image
+  <<: *debian_bookworm_amd64_image
   <<: *schedules_tags_web_triggering_rules
   stage: system
   variables:
     CC: gcc
-    CFLAGS: "${CFLAGS_COMMON} -Og"
+    CFLAGS: "${CFLAGS_COMMON} -Og -DOPENSSL_SUPPRESS_DEPRECATED"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.1"
   script:
     - *configure