From 8ef01c7b50d9700f81f4836657a62ccf80b91ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Thu, 26 Mar 2020 11:03:52 +0100
Subject: [PATCH] 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.
---
 .gitlab-ci.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12e69e3aa5..5e207cbff5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -915,9 +915,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:
@@ -937,9 +934,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:
@@ -970,9 +964,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:
@@ -992,9 +983,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: