CI: move dnsdist tsan build+test from CircleCI to GH Actions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43b63a1b036bda6d44dd7f571f2a5dc7afccef12..e52d2307feacbd12b086c28c9a1d62671ce6a413 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1759,124 +1759,6 @@ jobs:
           paths:
             - dnsdist
 
-  build-dnsdist-with-tsan:
-    docker:
-      - image: debian:buster
-        auth:
-          username: powerdnsreadonly
-          password: $DOCKERHUB_PASSWORD
-        environment:
-          TSAN_OPTIONS: 'halt_on_error=1:suppressions=/opt/project/pdns/dnsdistdist/dnsdist-tsan.supp'
-    steps:
-      - run:
-          name: Install dependencies
-          command: |
-            apt-get update && apt-get -qq --no-install-recommends install \
-            autoconf \
-            automake \
-            g++ \
-            git \
-            libboost-all-dev \
-            libcap-dev \
-            libcdb-dev \
-            libedit-dev \
-            libfstrm-dev \
-            libgnutls28-dev \
-            libh2o-evloop-dev \
-            liblmdb-dev \
-            libluajit-5.1-dev \
-            libre2-dev \
-            libsnmp-dev \
-            libsodium-dev \
-            libssl-dev \
-            libsystemd-dev \
-            libtool \
-            make \
-            pkg-config \
-            ragel \
-            systemd \
-            python3-venv
-      - install-clang-8
-      - restore-cache-ccache:
-          product: dnsdist-with-tsan
-      - get-workspace
-      - run:
-          name: autoconf
-          command: BUILDER_VERSION=0.0.0-git1 autoreconf -vfi
-          working_directory: ~/project/pdns/dnsdistdist
-      - run:
-          name: configure
-          command: |
-            CC='clang-8' \
-            CXX='clang++-8' \
-            CFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security -Werror=string-plus-int" \
-            CXXFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security -Werror=string-plus-int -Wp,-D_GLIBCXX_ASSERTIONS" \
-            ./configure \
-            --enable-option-checking=fatal \
-            --enable-unit-tests \
-            --enable-dnstap \
-            --enable-dnscrypt \
-            --enable-dns-over-tls \
-            --enable-dns-over-https \
-            --enable-systemd \
-            --prefix=/opt/dnsdist-with-tsan \
-            --with-gnutls \
-            --with-libsodium \
-            --with-lua=luajit \
-            --with-libcap \
-            --with-re2 \
-            --enable-tsan
-          working_directory: ~/project/pdns/dnsdistdist
-      - run:
-          name: build
-          command: make -j1 -k
-          working_directory: ~/project/pdns/dnsdistdist
-      - save-ccache-cache:
-          product: dnsdist-with-tsan
-      - run:
-          name: Run unit tests
-          command: make check || (cat test-suite.log; false)
-          working_directory: ~/project/pdns/dnsdistdist
-      - run:
-          name: Install resulting binaries
-          command: make install
-          working_directory: ~/project/pdns/dnsdistdist
-      - persist_to_workspace:
-          root: /opt
-          paths:
-            - dnsdist-with-tsan
-
-  test-dnsdist-regression-with-tsan:
-    resource_class: small
-
-    docker:
-      - image: debian:buster
-        auth:
-          username: powerdnsreadonly
-          password: $DOCKERHUB_PASSWORD
-        environment:
-          TSAN_OPTIONS: 'halt_on_error=1:suppressions=/opt/project/pdns/dnsdistdist/dnsdist-tsan.supp'
-    steps:
-      - install-dnsdist-deps
-      - install-clang-8 # for the symbolizer
-      - get-workspace
-      - run:
-          name: setup snmp
-          command: |
-            apt-get -qq --no-install-recommends install snmpd
-            sed "s/agentxperms 0700 0755 dnsdist/agentxperms 0700 0755/g" regression-tests.dnsdist/snmpd.conf > /etc/snmp/snmpd.conf
-            /etc/init.d/snmpd start
-      - run:
-          name: install prometheus tools
-          command: |
-            apt-get -qq --no-install-recommends install prometheus
-      - run:
-          name: Run dnsdist tests
-          workdir: ~/project/regression-tests.dnsdist
-          command: |
-            DNSDISTBIN="/opt/dnsdist-with-tsan/bin/dnsdist" \
-            ./runtests
-
   test-ixfrdist-regression:
     resource_class: small
 
@@ -1972,15 +1854,6 @@ workflows:
       - test-recursor-bulk:
           requires:
             - build-recursor
-      - build-dnsdist:
-          requires:
-            - checkout
-      - build-dnsdist-with-tsan:
-          requires:
-            - checkout
-      - test-dnsdist-regression-with-tsan:
-          requires:
-            - build-dnsdist-with-tsan
       - test-ixfrdist-regression:
           requires:
             - build-auth

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 59aafd3abe3622ca6810ca3d6ef9c5bffff4dacc..83bcd367f4a054e1917fa75ba544899448f2f2e4 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -68,9 +68,13 @@ jobs:
   build-dnsdist:
     name: build dnsdist
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        sanitizers: [ubsan+asan, tsan]
     env:
       UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1:suppressions=/home/runner/work/pdns/pdns/build-scripts/UBSan.supp'
       ASAN_OPTIONS: detect_leaks=0
+      SANITIZERS: ${{ matrix.sanitizers }}
     defaults:
       run:
         working-directory: ./pdns/dnsdistdist/
@@ -92,7 +96,7 @@ jobs:
       - name: Store the binaries
         uses: actions/upload-artifact@v2 # this takes 30 seconds, maybe we want to tar
         with:
-          name: dnsdist
+          name: dnsdist-${{ matrix.sanitizers }}
           path: /opt/dnsdist
 
   test-auth-api:
@@ -101,6 +105,7 @@ jobs:
     env:
       UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1:suppressions=/home/runner/work/pdns/pdns/build-scripts/UBSan.supp'
       ASAN_OPTIONS: detect_leaks=0
+      TSAN_OPTIONS: 'halt_on_error=1:suppressions=/home/runner/work/pdns/pdns/pdns/dnsdistdist/dnsdist-tsan.supp'
     strategy:
       matrix:
         include:
@@ -217,9 +222,13 @@ jobs:
   test-dnsdist-regression:
     needs: build-dnsdist
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        sanitizers: [ubsan+asan, tsan]
     env:
       UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1:suppressions=/home/runner/work/pdns/pdns/build-scripts/UBSan.supp'
       ASAN_OPTIONS: detect_leaks=0
+      TSAN_OPTIONS: 'halt_on_error=1:suppressions=/home/runner/work/pdns/pdns/pdns/dnsdistdist/dnsdist-tsan.supp'
     steps:
       - uses: actions/checkout@v2.3.4
         with:
@@ -228,7 +237,7 @@ jobs:
       - name: Fetch the binaries
         uses: actions/download-artifact@v2
         with:
-          name: dnsdist
+          name: dnsdist-${{ matrix.sanitizers }}
           path: /opt/dnsdist
       - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
       - run: inv install-clang-runtime

diff --git a/tasks.py b/tasks.py
index 6b3ec97a74890574fedf96f0de0536a4bda66d9c..3db92b8b18d0153693b16262fc75db1a4dd9aa0a 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -1,6 +1,7 @@
 from invoke import task
 from invoke.exceptions import Failure, UnexpectedExit
 
+import os
 import sys
 import time
 
@@ -249,6 +250,7 @@ def ci_rec_configure(c):
 
 @task
 def ci_dnsdist_configure(c):
+    sanitizers = ' '.join('--enable-'+x for x in os.getenv('SANITIZERS').split('+'))
     res = c.run('''CFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security -Werror=string-plus-int" \
                    CXXFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security -Werror=string-plus-int -Wp,-D_GLIBCXX_ASSERTIONS" \
                    ./configure \
@@ -266,9 +268,7 @@ def ci_dnsdist_configure(c):
                      --with-libsodium \
                      --with-lua=luajit \
                      --with-libcap \
-                     --with-re2 \
-                     --enable-asan \
-                     --enable-ubsan''', warn=True)
+                     --with-re2 ''' + sanitizers, warn=True)
     if res.exited != 0:
         c.run('cat config.log')
         raise UnexpectedExit(res)