auth-4.6.x: do not run dnsdist/rec CI

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90eae231c78906a5e3b2663200874e33d35db870..9c20eaefb4a4912d1fa470c8f991321c5d8ed1cc 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1255,10 +1255,6 @@ workflows:
     jobs:
       - coverity-auth:
           context: auth-coverity
-      - coverity-dnsdist:
-          context: dnsdist-coverity
-      - coverity-recursor:
-          context: recursor-coverity
 
   build-and-test-all:
     jobs:
@@ -1278,57 +1274,3 @@ workflows:
       - test-auth-regress-ldap:
           requires:
             - build-auth
-      - build-recursor:
-          requires:
-            - checkout
-      - test-recursor-regression:
-          requires:
-            - build-recursor
-      - test-recursor-bulk:
-          requires:
-            - build-recursor
-
-  build-docs:
-    jobs:
-      - checkout
-      - build-auth-docs:
-          filters:
-            branches:
-              ignore: master
-          requires:
-            - checkout
-      - build-recursor-docs:
-          filters:
-            branches:
-              ignore: master
-          requires:
-            - checkout
-      - build-dnsdist-docs:
-          filters:
-            branches:
-              ignore: master
-          requires:
-            - checkout
-
-      # These actually deploy
-      - deploy-auth-docs:
-          context: docs
-          filters:
-            branches:
-              only: master
-          requires:
-            - checkout
-      - deploy-recursor-docs:
-          context: docs
-          filters:
-            branches:
-              only: master
-          requires:
-            - checkout
-      - deploy-dnsdist-docs:
-          context: docs
-          filters:
-            branches:
-              only: master
-          requires:
-            - checkout

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index f4dc548ea082129e8abc05d19619063b417b81b9..71eaa0718c9c00b83e76f46e86b0f337861d6bda 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -47,98 +47,6 @@ jobs:
           path: /opt/pdns-auth
           retention-days: 1
 
-  build-recursor:
-    name: build recursor
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        sanitizers: [ubsan+asan, tsan]
-    env:
-      UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
-      ASAN_OPTIONS: detect_leaks=0
-      SANITIZERS: ${{ matrix.sanitizers }}
-    defaults:
-      run:
-        working-directory: ./pdns/recursordist/
-    steps:
-      - uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 5
-          submodules: recursive
-      - name: get timestamp for cache
-        id: get-stamp
-        run: |
-          echo "::set-output name=stamp::$(/bin/date +%s)"
-        shell: bash
-      - name: let GitHub cache our ccache data
-        uses: actions/cache@v2
-        with:
-          path: ~/.ccache
-          key: recursor-${{ matrix.sanitizers }}-ccache-${{ steps.get-stamp.outputs.stamp }}
-          restore-keys: recursor-${{ matrix.sanitizers }}-ccache-
-      - run: ../../build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv apt-fresh
-      - run: inv install-clang
-      - run: inv install-rec-build-deps
-      - run: inv ci-autoconf
-      - run: inv ci-rec-configure
-      - run: inv ci-rec-make
-      - run: inv ci-rec-run-unit-tests
-      - run: inv ci-make-install
-      - run: ccache -s
-      - name: Store the binaries
-        uses: actions/upload-artifact@v2 # this takes 30 seconds, maybe we want to tar
-        with:
-          name: pdns-recursor-${{ matrix.sanitizers }}
-          path: /opt/pdns-recursor
-          retention-days: 1
-
-  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=${{ github.workspace }}/build-scripts/UBSan.supp"
-      ASAN_OPTIONS: detect_leaks=0
-      SANITIZERS: ${{ matrix.sanitizers }}
-    defaults:
-      run:
-        working-directory: ./pdns/dnsdistdist/
-    steps:
-      - uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 5
-          submodules: recursive
-      - name: get timestamp for cache
-        id: get-stamp
-        run: |
-          echo "::set-output name=stamp::$(/bin/date +%s)"
-        shell: bash
-      - name: let GitHub cache our ccache data
-        uses: actions/cache@v2
-        with:
-          path: ~/.ccache
-          key: dnsdist-${{ matrix.sanitizers }}-ccache-${{ steps.get-stamp.outputs.stamp }}
-          restore-keys: dnsdist-${{ matrix.sanitizers }}-ccache-
-      - run: ../../build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv apt-fresh
-      - run: inv install-clang
-      - run: inv install-dnsdist-build-deps
-      - run: inv ci-autoconf
-      - run: inv ci-dnsdist-configure
-      - run: inv ci-dnsdist-make
-      - run: inv ci-dnsdist-run-unit-tests
-      - run: inv ci-make-install
-      - run: ccache -s
-      - name: Store the binaries
-        uses: actions/upload-artifact@v2 # this takes 30 seconds, maybe we want to tar
-        with:
-          name: dnsdist-${{ matrix.sanitizers }}
-          path: /opt/dnsdist
-          retention-days: 1
-
   test-auth-api:
     needs: build-auth
     runs-on: ubuntu-20.04
@@ -272,126 +180,12 @@ jobs:
       - run: inv install-auth-test-deps
       - run: inv test-ixfrdist
 
-  test-recursor-api:
-    needs: build-recursor
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        sanitizers: [ubsan+asan, tsan]
-    env:
-      UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
-      ASAN_OPTIONS: detect_leaks=0
-      TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/recursordist/recursor-tsan.supp"
-    steps:
-      - uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 5
-          submodules: recursive
-      - name: Fetch the binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: pdns-recursor-${{ matrix.sanitizers }}
-          path: /opt/pdns-recursor
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv add-auth-repo  # FIXME: do we need this for rec API testing?
-      - run: inv install-clang-runtime
-      - run: inv install-rec-test-deps
-      - run: inv test-api recursor
-
-  test-recursor-regression:
-    needs: build-recursor
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        sanitizers: [ubsan+asan]
-    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=${{ github.workspace }}/pdns/recursordist/recursor-tsan.supp"
-    steps:
-      - uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 5
-          submodules: recursive
-      - name: Fetch the binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: pdns-recursor-${{ matrix.sanitizers }}
-          path: /opt/pdns-recursor
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv add-auth-repo
-      - run: inv install-clang-runtime
-      - run: inv install-rec-test-deps
-      - run: inv test-regression-recursor
-
-  test-recursor-bulk:
-    name: 'test rec *mini* bulk'
-    needs: build-recursor
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        sanitizers: [ubsan+asan]
-        threads: [1, 2, 3, 4, 8, 16]
-        mthreads: [2048, 4096]
-        shards: [1, 2, 1024]
-    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=${{ github.workspace }}/pdns/recursordist/recursor-tsan.supp"
-    steps:
-      - uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 5
-          submodules: recursive
-      - name: Fetch the binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: pdns-recursor-${{ matrix.sanitizers }}
-          path: /opt/pdns-recursor
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv install-clang-runtime
-      - run: inv install-rec-bulk-deps
-      - run: inv test-bulk-recursor ${{ matrix.threads }} ${{ matrix.mthreads }} ${{ matrix.shards }}
-
-  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=${{ github.workspace }}/build-scripts/UBSan.supp"
-      ASAN_OPTIONS: detect_leaks=0
-      TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/dnsdistdist/dnsdist-tsan.supp"
-      # IncludeDir tests are disabled because of a weird interaction between TSAN and these tests which ever only happens on GH actions
-      SKIP_INCLUDEDIR_TESTS: yes
-    steps:
-      - uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 5
-          submodules: recursive
-      - name: Fetch the binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: dnsdist-${{ matrix.sanitizers }}
-          path: /opt/dnsdist
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv install-clang-runtime
-      - run: inv install-dnsdist-test-deps
-      - run: inv test-dnsdist
-
   collect:
     needs:
       - build-auth
-      - build-dnsdist
-      - build-recursor
       - test-auth-api
       - test-auth-backend
-      - test-dnsdist-regression
       - test-ixfrdist
-      - test-recursor-api
-      - test-recursor-regression
-      - test-recursor-bulk
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2.3.4

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 28f36b4ca563ebf356c41ccf75e507f459f38cc1..d9663e2e39e2455181128ffe289088148730c9b0 100644 (file)
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        product: ['authoritative', 'recursor', 'dnsdist']
+        product: ['authoritative']
         os:
           - centos-7
           - ubuntu-bionic

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cdaf72292ae4457ff3ce2f92abba318f3e12fbb5..bd815553257247554dfe02c5c7eecafaf5201a02 100644 (file)
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -17,7 +17,7 @@ jobs:
         # Override automatic language detection by changing the below list
         # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
         language: ['cpp']
-        product: ['auth', 'rec', 'dnsdist']
+        product: ['auth']
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
@@ -105,25 +105,5 @@ jobs:
         make -j8 -C modules
         make -j8 -C pdns
 
-    - name: Build dnsdist
-      if: matrix.product == 'dnsdist'
-      run: |
-        cd pdns/dnsdistdist
-        autoreconf -vfi
-        ./configure --enable-unit-tests --enable-dnstap --enable-dnscrypt --enable-dns-over-tls --enable-dns-over-https LIBS=-lwslay CFLAGS='-O0' CXXFLAGS='-O0'
-        make -j8 -C ext/ipcrypt
-        make -j8 -C ext/yahttp
-        make -j4 dnsdist
-
-    - name: Build recursor
-      if: matrix.product == 'rec'
-      run: |
-        cd pdns/recursordist
-        autoreconf -vfi
-        ./configure --enable-unit-tests --enable-nod --enable-dnstap CFLAGS='-O0' CXXFLAGS='-O0'
-        make -j8 -C ext
-        make htmlfiles.h
-        make -j8 pdns_recursor rec_control
-
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 09c3dd9049bcb022dba1c75e13d8d62565a834ce..b4e8e491be07a7d4c8fdc8606b66a4122439c547 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        product: ['auth', 'recursor', 'dnsdist']
+        product: ['auth']
     steps:
       - uses: actions/checkout@v2.3.4
         with: