From: Michal Nowak <mnowak@isc.org>
Date: Mon, 16 Aug 2021 17:07:07 +0000 (+0200)
Subject: Add respdiff job with third-party recursors
X-Git-Tag: v9.11.37~8^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9aa1c580b710c29d231a674a7b7036abc7412c4c;p=thirdparty%2Fbind9.git

Add respdiff job with third-party recursors

The order of directories with reference and test BIND 9 are now reversed
for respdiff.sh.

The data.mdb file has more than 10 GB and makes artifact download take
an unnecessarily long time.

(cherry picked from commit 2ececf2c027092fa9dfa752cf4756d37d6a0348d)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 535f1737bf2..bc94219794f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1405,7 +1405,7 @@ coverity:
       - cov-analysis-linux64.md5
       - cov-analysis-linux64.tgz
 
-# Respdiff test
+# Respdiff tests
 
 respdiff:
   <<: *base_image
@@ -1421,19 +1421,42 @@ respdiff:
     - 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 refbind
-    - cd refbind/
+    - git clone --branch "${BIND_BASELINE_VERSION}" --depth 1 https://gitlab.isc.org/isc-projects/bind9.git refserver
+    - cd refserver/
     - ./configure --without-make-clean
     - make -j${BUILD_PARALLEL_JOBS:-1} V=1
     - cd ../bind-qa/bind9/respdiff
-    - bash respdiff.sh -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}/refbind" "${CI_PROJECT_DIR}"
-  needs:
-    - job: tarball-create
-      artifacts: true
+    - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "${CI_PROJECT_DIR}/refserver"
+  artifacts:
+    paths:
+      - refserver
+      - bind-qa/bind9/respdiff
+    exclude:
+      - bind-qa/bind9/respdiff/rspworkdir/data.mdb # Exclude a 10 GB file.
+    untracked: true
+    expire_in: "1 day"
+    when: always
+
+respdiff-third-party:
+  <<: *base_image
+  <<: *schedules_tags_web_triggering_rules
+  stage: system
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON} -Og"
+    MAX_DISAGREEMENTS_PERCENTAGE: "0.1"
+  script:
+    - ./configure --without-make-clean
+    - 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
+    - cd bind-qa/bind9/respdiff
+    - bash respdiff.sh -s third_party -q "${PWD}/100k_mixed.txt" -c 1 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}"
   artifacts:
     paths:
-      - refbind
       - bind-qa/bind9/respdiff
+    exclude:
+      - bind-qa/bind9/respdiff/rspworkdir/data.mdb # Exclude a 10 GB file.
     untracked: true
     expire_in: "1 day"
     when: always