From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 2 Feb 2022 09:28:44 +0000 (+0100)
Subject: stop testing auth+dnsdist on rec branch
X-Git-Tag: rec-4.6.2~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11282%2Fhead;p=thirdparty%2Fpdns.git

stop testing auth+dnsdist on rec branch
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ab11a3db9..2a04298eeb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1285,31 +1285,12 @@ workflows:
             branches:
               only: master
     jobs:
-      - coverity-auth:
-          context: auth-coverity
-      - coverity-dnsdist:
-          context: dnsdist-coverity
       - coverity-recursor:
           context: recursor-coverity
 
   build-and-test-all:
     jobs:
       - checkout
-      - build-auth:
-          requires:
-            - checkout
-      - test-auth-regress-odbc-sqlite3:
-          requires:
-            - build-auth
-      - test-auth-regress-odbc-mssql:
-          requires:
-            - build-auth
-      - test-auth-regress-geoip:
-          requires:
-            - build-auth
-      - test-auth-regress-ldap:
-          requires:
-            - build-auth
       - check-formatting:
           requires:
             - checkout
@@ -1323,47 +1304,3 @@ workflows:
           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 f4dc548ea0..64e686c3dc 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -8,45 +8,6 @@ on:
     - cron: '0 22 * * 3'
 
 jobs:
-  build-auth:
-    name: build auth
-    runs-on: ubuntu-20.04
-    env:
-      UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
-      ASAN_OPTIONS: detect_leaks=0
-    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: auth-ccache-${{ steps.get-stamp.outputs.stamp }}
-          restore-keys: auth-ccache-
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv install-clang
-      - run: inv install-auth-build-deps
-      - run: inv ci-autoconf
-      - run: inv ci-auth-configure
-      - run: inv ci-auth-make
-      - run: inv ci-auth-install-remotebackend-ruby-deps
-      - run: inv ci-auth-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-auth
-          path: /opt/pdns-auth
-          retention-days: 1
-
   build-recursor:
     name: build recursor
     runs-on: ubuntu-20.04
@@ -93,185 +54,6 @@ jobs:
           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
-    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"
-    strategy:
-      matrix:
-        include:
-          - backend: gsqlite3
-            image: coscale/docker-sleep
-          - backend: gmysql
-            image: mysql:5
-          - backend: gpgsql
-            image: postgres:9
-          - backend: lmdb
-            image: coscale/docker-sleep
-      fail-fast: false
-    services:
-      database:
-        image: ${{ matrix.image }}
-        env:
-          POSTGRES_USER: runner
-          POSTGRES_HOST_AUTH_METHOD: trust
-          MYSQL_ALLOW_EMPTY_PASSWORD: 1
-        ports:
-          - 3306:3306
-          - 5432:5432
-        # FIXME: this works around dist-upgrade stopping all docker containers. dist-upgrade is huge on these images anyway. Perhaps we do want to run our tasks in a Docker container too.
-        options: >-
-          --restart always
-    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-auth
-          path: /opt/pdns-auth
-      # - name: Setup upterm session
-      #   uses: lhotari/action-upterm@v1
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv install-clang-runtime
-      - run: inv install-auth-test-deps -b ${{ matrix.backend }}
-      - run: inv test-api auth -b ${{ matrix.backend }}
-
-  test-auth-backend:
-    needs: build-auth
-    runs-on: ubuntu-20.04
-    env:
-      UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
-      ASAN_OPTIONS: detect_leaks=0
-    strategy:
-      matrix:
-        include:
-          - backend: remote
-            image: coscale/docker-sleep
-          - backend: gmysql
-            image: mysql:5
-          - backend: gmysql
-            image: mariadb:10
-          - backend: gpgsql
-            image: postgres:9
-          - backend: gsqlite3  # this also runs regression-tests.nobackend and pdnsutil test-algorithms
-            image: coscale/docker-sleep
-          - backend: lmdb
-            image: coscale/docker-sleep
-          - backend: bind
-            image: coscale/docker-sleep
-          - backend: geoip
-            image: coscale/docker-sleep
-          - backend: lua2
-            image: coscale/docker-sleep
-          - backend: tinydns
-            image: coscale/docker-sleep
-          - backend: authpy
-            image: coscale/docker-sleep
-      fail-fast: false
-    services:
-      database:
-        image: ${{ matrix.image }}
-        env:
-          POSTGRES_USER: runner
-          POSTGRES_HOST_AUTH_METHOD: trust
-          MYSQL_ALLOW_EMPTY_PASSWORD: 1
-        ports:
-          - 3306:3306
-          - 5432:5432
-        # FIXME: this works around dist-upgrade stopping all docker containers. dist-upgrade is huge on these images anyway. Perhaps we do want to run our tasks in a Docker container too.
-        options: >-
-          --restart always
-    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-auth
-          path: /opt/pdns-auth
-      # - name: Setup upterm session
-      #   uses: lhotari/action-upterm@v1
-      # FIXME: install recursor for backends that have ALIAS
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv install-clang-runtime
-      - run: inv install-auth-test-deps -b ${{ matrix.backend }}
-      - run: inv test-auth-backend -b ${{ matrix.backend }}
-
-  test-ixfrdist:
-    needs: build-auth
-    runs-on: ubuntu-20.04
-    env:
-      UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
-      ASAN_OPTIONS: detect_leaks=0
-    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-auth
-          path: /opt/pdns-auth
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv install-clang-runtime
-      - run: inv install-auth-test-deps
-      - run: inv test-ixfrdist
-
   test-recursor-api:
     needs: build-recursor
     runs-on: ubuntu-20.04
@@ -353,42 +135,9 @@ jobs:
       - 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
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 28f36b4ca5..be39dd7247 100644
--- 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: ['recursor']
         os:
           - centos-7
           - ubuntu-bionic