]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist-1.7.x: Remove non dnsdist-related CI steps 11085/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Thu, 9 Dec 2021 13:24:35 +0000 (14:24 +0100)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Thu, 9 Dec 2021 13:24:35 +0000 (14:24 +0100)
.circleci/config.yml
.github/workflows/build-and-test-all.yml
.github/workflows/builder.yml
.github/workflows/codeql-analysis.yml
.github/workflows/docker.yml

index 90eae231c78906a5e3b2663200874e33d35db870..da3d5104da109051207ec70978706aa0ae858884 100644 (file)
@@ -1253,82 +1253,10 @@ 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
-      - 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
index f4dc548ea082129e8abc05d19619063b417b81b9..f6e324f59090aaf08e538c6ce2d518a6ca7a08a7 100644 (file)
@@ -8,91 +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
-    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
@@ -139,220 +54,6 @@ jobs:
           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
-    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
@@ -382,16 +83,8 @@ jobs:
 
   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
index 28f36b4ca563ebf356c41ccf75e507f459f38cc1..f27d2e9f26bf69afd6b97f82eadbc677a79a23c0 100644 (file)
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        product: ['authoritative', 'recursor', 'dnsdist']
+        product: ['dnsdist']
         os:
           - centos-7
           - ubuntu-bionic
index cdaf72292ae4457ff3ce2f92abba318f3e12fbb5..bc77ead21e784a029c47e059c805668edfc4efaf 100644 (file)
@@ -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: ['dnsdist']
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
@@ -96,15 +96,6 @@ jobs:
                 ragel \
                 unixodbc-dev
 
-    - name: Build auth
-      if: matrix.product == 'auth'
-      run: |
-        autoreconf -vfi
-        ./configure --with-modules='bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe remote tinydns' --enable-tools --enable-ixfrdist --enable-dns-over-tls --enable-experimental-pkcs11 --with-libsodium --enable-lua-records CFLAGS='-O0' CXXFLAGS='-O0'
-        make -j8 -C ext
-        make -j8 -C modules
-        make -j8 -C pdns
-
     - name: Build dnsdist
       if: matrix.product == 'dnsdist'
       run: |
@@ -115,15 +106,5 @@ jobs:
         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
index 09c3dd9049bcb022dba1c75e13d8d62565a834ce..eb7d053f895267ebc5d9d921e7520fee02c9e693 100644 (file)
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        product: ['auth', 'recursor', 'dnsdist']
+        product: ['dnsdist']
     steps:
       - uses: actions/checkout@v2.3.4
         with: