From: Alexis Romero Date: Wed, 16 Aug 2023 12:41:23 +0000 (+0200) Subject: run build-and-test-test-all workflow on debian bookworm X-Git-Tag: dnsdist-1.9.0-alpha4~22^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b69425da3e76e21c9cb4f22455b0a39f786efa78;p=thirdparty%2Fpdns.git run build-and-test-test-all workflow on debian bookworm simplified package version --- diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index f860327f7c..4150fad29d 100644 --- a/.github/workflows/build-and-test-all.yml +++ b/.github/workflows/build-and-test-all.yml @@ -25,9 +25,9 @@ jobs: build-auth: name: build auth if: ${{ !github.event.schedule || vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: ASAN_OPTIONS: detect_leaks=0 FUZZING_TARGETS: yes @@ -90,12 +90,12 @@ jobs: build-recursor: name: build recursor if: ${{ !github.event.schedule || vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: sanitizers: [ubsan+asan, tsan] container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: ASAN_OPTIONS: detect_leaks=0 SANITIZERS: ${{ matrix.sanitizers }} @@ -157,7 +157,7 @@ jobs: build-dnsdist: name: build dnsdist if: ${{ !github.event.schedule || vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: sanitizers: [ubsan+asan, tsan] @@ -166,7 +166,7 @@ jobs: - sanitizers: tsan features: least container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: ASAN_OPTIONS: detect_leaks=0 SANITIZERS: ${{ matrix.sanitizers }} @@ -230,9 +230,9 @@ jobs: test-auth-api: needs: build-auth - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ env.REPO_HOME }}/build-scripts/UBSan.supp" ASAN_OPTIONS: detect_leaks=0 @@ -291,9 +291,9 @@ jobs: test-auth-backend: needs: build-auth - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ env.REPO_HOME }}/build-scripts/UBSan.supp" ASAN_OPTIONS: detect_leaks=0 @@ -413,9 +413,9 @@ jobs: test-ixfrdist: needs: build-auth - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ env.REPO_HOME }}/build-scripts/UBSan.supp" ASAN_OPTIONS: detect_leaks=0 @@ -446,15 +446,15 @@ jobs: test-recursor-api: needs: build-recursor - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: sanitizers: [ubsan+asan, tsan] dist_name: [debian] - dist_release_name: [bullseye] - pdns_repo_version: ['45'] + dist_release_name: [bookworm] + pdns_repo_version: ['48'] container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ env.REPO_HOME }}/build-scripts/UBSan.supp" ASAN_OPTIONS: detect_leaks=0 @@ -488,15 +488,15 @@ jobs: test-recursor-regression: needs: build-recursor - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: sanitizers: [ubsan+asan, tsan] dist_name: [debian] - dist_release_name: [bullseye] + dist_release_name: [bookworm] pdns_repo_version: ['48'] container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1:suppressions=${{ env.REPO_HOME }}/build-scripts/UBSan.supp' ASAN_OPTIONS: detect_leaks=0 @@ -532,7 +532,7 @@ jobs: test-recursor-bulk: name: 'test rec *mini* bulk' needs: build-recursor - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: sanitizers: [ubsan+asan, tsan] @@ -540,7 +540,7 @@ jobs: mthreads: [2048] shards: [1, 2, 1024] container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1:suppressions=${{ env.REPO_HOME }}/build-scripts/UBSan.supp' ASAN_OPTIONS: detect_leaks=0 @@ -572,12 +572,12 @@ jobs: test-dnsdist-regression: needs: build-dnsdist - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: sanitizers: [ubsan+asan, tsan] container: - image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master + image: ghcr.io/powerdns/base-pdns-ci-image/debian-12-pdns-base:master env: UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ env.REPO_HOME }}/build-scripts/UBSan.supp" # Disabling (intercept_send=0) the custom send wrappers for ASAN and TSAN because they cause the tools to report a race that doesn't exist on actual implementations of send(), see https://github.com/google/sanitizers/issues/1498 @@ -614,7 +614,7 @@ jobs: swagger-syntax-check: if: ${{ !github.event.schedule || vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # FIXME: https://github.com/PowerDNS/pdns/pull/12880 # container: # image: ghcr.io/powerdns/base-pdns-ci-image/debian-11-pdns-base:master @@ -643,7 +643,7 @@ jobs: - test-recursor-regression - test-recursor-bulk if: success() || failure() - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Coveralls Parallel Finished if: ${{ env.COVERAGE == 'yes' }} diff --git a/tasks.py b/tasks.py index 3583d4d3d6..6c98a9d0ca 100644 --- a/tasks.py +++ b/tasks.py @@ -16,7 +16,7 @@ all_build_deps = [ 'libboost-all-dev', 'libluajit-5.1-dev', 'libsodium-dev', - 'libssl-dev', + 'libssl-dev', # This will install libssl 1.1 on Debian 11 and libssl3 on Debian 12 'libsystemd-dev', 'libtool', 'make', @@ -67,7 +67,6 @@ rec_bulk_deps = [ 'libluajit-5.1-2', '"libsnmp[1-9]+"', 'libsodium23', - 'libssl1.1', 'libsystemd0', 'moreutils', 'pdns-tools', @@ -101,7 +100,7 @@ auth_test_deps = [ # FIXME: we should be generating some of these from shlibde 'libcurl4', 'libgeoip1', 'libkrb5-3', - 'libldap-2.4-2', + '"libldap-2.[1-9]+"', 'liblmdb0', 'libluajit-5.1-2', 'libmaxminddb0', @@ -110,9 +109,8 @@ auth_test_deps = [ # FIXME: we should be generating some of these from shlibde 'libpq5', 'libsodium23', 'libsqlite3-dev', - 'libssl1.1', 'libsystemd0', - 'libyaml-cpp0.6', + '"libyaml-cpp0.[1-9]+"', 'libzmq3-dev', 'lmdb-utils', 'prometheus',