.gitlab-ci.yml: merged ASAN and UBSAN runs

This in addition to merging the two CI runs, it also attempts
to run the fuzz code under SHANI for CI.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f12eb87b918490af3bf659ec8036cf23ff5b3e6..e75461f65af0bfb9b075c750d91d820580f6db07 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,39 +226,6 @@ valgrind.Fedora.x86_64:
       - tests/*/*.log
   retry: 1
 
-# Two runs, one with normal backend and another with pkcs11 trust store
-asan.Fedora.x86_64:
-  stage: stage1-testing
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - SUBMODULE_NOFETCH=1  ./bootstrap
-  - CFLAGS="-fsanitize=address -g -O2" CXXFLAGS=$CFLAGS LDFLAGS="-static-libasan"
-    dash ./configure --disable-gcc-warnings --disable-doc --cache-file cache/config.cache --disable-non-suiteb-curves --disable-guile
-  - make -j$(nproc)
-  - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make check -j$(nproc)
-  - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x1
-  - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x2
-  - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x4
-  - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x8
-  - CFLAGS="-fsanitize=address -g -O2" CXXFLAGS=$CFLAGS LDFLAGS="-static-libasan"
-    dash ./configure --cache-file cache/config.cache --disable-doc --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM --with-default-trust-store-pkcs11="pkcs11:" --disable-guile
-  - make -j$(nproc)
-  - make -C tests check -j$(nproc) TESTS="trust-store p11-kit-load.sh priority-init2 set-default-prio" SUBDIRS=.
-  tags:
-  - shared
-  except:
-  - tags
-  artifacts:
-    expire_in: 1 week
-    when: on_failure
-    paths:
-      - ./*.log
-      - fuzz/*.log
-      - tests/*.log
-      - tests/*/*.log
-      - tests/suite/*/*.log
-  retry: 1
-
 threadsan.Fedora.x86_64:
   stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
@@ -488,12 +455,17 @@ UB+ASAN-Werror.Fedora.x86_64.gcc:
   - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
   - make -j$(nproc)
   - make check -j$(nproc) -C fuzz
+  - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x1
+  - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x2
+  - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x4
+  - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x8
+  - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x20
   - make check -j$(nproc) -C tests
-  - dash ./configure --cache-file cache/config.cache --disable-guile --disable-doc --disable-hardware-acceleration --with-default-trust-store-pkcs11="pkcs11:"
+  - dash ./configure --cache-file cache/config.cache --disable-guile --disable-doc --disable-hardware-acceleration --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
   - make clean
   - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
   - make -j$(nproc)
-  - make check -j$(nproc) -C tests TESTS="trust-store p11-kit-load.sh" SUBDIRS=.
+  - make check -j$(nproc) -C tests TESTS="trust-store p11-kit-load.sh priority-init2 set-default-prio" SUBDIRS=.
   tags:
   - shared
   except:
@@ -504,6 +476,7 @@ UB+ASAN-Werror.Fedora.x86_64.gcc:
     paths:
       - guile/tests/*.log
       - ./*.log
+      - fuzz/*.log
       - tests/*.log
       - tests/*/*.log
       - tests/suite/*/*.log