Define TSAN options in a global variable

All assignments for the TSAN_OPTIONS variable are identical across the
entire .gitlab-ci.yml file.  Define a global TSAN_OPTIONS_COMMON
variable and use it in job definitions to reduce code duplication.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f68d3453bdbf22a46491d099874c34d5fe85a024..12e69e3aa57665ac28bee9bfc1b32568b344c42e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ variables:
 
   # Pass run-time flags to AddressSanitizer to get core dumps on error.
   ASAN_OPTIONS_COMMON: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
+  TSAN_OPTIONS_COMMON: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER"
 
   TARBALL_COMPRESSOR: xz
   TARBALL_EXTENSION: xz
@@ -913,7 +914,7 @@ gcc:tsan:
 
 system:gcc:tsan:
   variables:
-    TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER exitcode=0"
+    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
   before_script:
     - *setup_interfaces
     - echo $TSAN_OPTIONS
@@ -935,7 +936,7 @@ system:gcc:tsan:
 
 unit:gcc:tsan:
   variables:
-    TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER"
+    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
   before_script:
     - echo $TSAN_OPTIONS
     - lib/isc/tests/result_test
@@ -968,7 +969,7 @@ clang:tsan:
 
 system:clang:tsan:
   variables:
-    TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER exitcode=0"
+    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
   before_script:
     - *setup_interfaces
     - echo $TSAN_OPTIONS
@@ -990,7 +991,7 @@ system:clang:tsan:
 
 unit:clang:tsan:
   variables:
-    TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER"
+    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
   before_script:
     - echo $TSAN_OPTIONS
     - lib/isc/tests/result_test