From: Michał Kępień <michal@isc.org>
Date: Thu, 26 Mar 2020 10:03:52 +0000 (+0100)
Subject: Drop "before_script" key from TSAN job definitions
X-Git-Tag: v9.14.12~9^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ba8fac3513aab5107e098b806c6a27be8efcf04;p=thirdparty%2Fbind9.git

Drop "before_script" key from TSAN job definitions

Both "system_test_job" and "unit_test_job" YAML anchors contain a
"before_script" key.  TSAN job definitions first specify their own value
of the "before_script" key and then include the aforementioned YAML
anchors, which results in the value of the "before_script" key being
overridden with the value specified by the included anchor.  Given this,
remove "before_script" definitions specific to TSAN jobs as they serve
no practical purpose.

(cherry picked from commit 8ef01c7b50d9700f81f4836657a62ccf80b91ac7)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 937ecb8163c..8c581dd79fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -917,9 +917,6 @@ gcc:tsan:
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  before_script:
-    - *setup_interfaces
-    - echo $TSAN_OPTIONS
   <<: *base_image
   <<: *system_test_job
   needs:
@@ -939,9 +936,6 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  before_script:
-    - echo $TSAN_OPTIONS
-    - lib/isc/tests/result_test
   <<: *base_image
   <<: *unit_test_job
   needs:
@@ -972,9 +966,6 @@ clang:tsan:
 system:clang:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  before_script:
-    - *setup_interfaces
-    - echo $TSAN_OPTIONS
   <<: *base_image
   <<: *system_test_job
   needs:
@@ -994,9 +985,6 @@ system:clang:tsan:
 unit:clang:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  before_script:
-    - echo $TSAN_OPTIONS
-    - lib/isc/tests/result_test
   <<: *base_image
   <<: *unit_test_job
   needs: