]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Use Fedora image for GCC ASAN and TSAN CI jobs
authorMichal Nowak <mnowak@isc.org>
Thu, 18 Feb 2021 15:19:57 +0000 (16:19 +0100)
committerMichal Nowak <mnowak@isc.org>
Fri, 22 Oct 2021 11:03:13 +0000 (13:03 +0200)
For the sake of running ASAN and TSAN jobs with the latest stable GCC,
replace "base image" (Debian Buster with GCC 8.3.0) with Fedora 34 image
with GCC 11.

(cherry picked from commit 6ab2d8968603b624772f5fb82c09373a8a8d79c0)

.gitlab-ci.yml

index 8c3348e96b5088def60e17a3ccecbb916b17ca1b..7c0b773ff0fe3e58c3a7b46902abd78ff82834df 100644 (file)
@@ -938,13 +938,13 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2"
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *build_job
 
 system:gcc:asan:
   variables:
     ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
@@ -953,7 +953,7 @@ system:gcc:asan:
 unit:gcc:asan:
   variables:
     ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -989,18 +989,18 @@ unit:clang:asan:
 # Jobs for TSAN builds on Debian 10 "buster" (amd64)
 
 gcc:tsan:
-  <<: *base_image
-  <<: *build_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock"
+  <<: *fedora_34_amd64_image
+  <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1009,7 +1009,7 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan