diff --git a/.github/workflows/testing-go.yml b/.github/workflows/testing-go.yml index aeed9eff..1835951d 100644 --- a/.github/workflows/testing-go.yml +++ b/.github/workflows/testing-go.yml @@ -45,7 +45,7 @@ jobs: testunit: strategy: matrix: - os-version: [ 'ubuntu-22.04', 'ubuntu-24.04' ] + os-version: [ 'ubuntu-24.04' ] go-version: [ '1.21', '1.22', '1.23' ] package: - '.' @@ -147,7 +147,7 @@ jobs: - id: count_tests run: | - data=$(sudo go test -timeout 360s -v ./workers ./dnsutils ./transformers ./pkgconfig ./pkginit ./telemetry ././ 2>&1 | grep -c RUN) + data=$(sudo go test -timeout 360s -v -exec sudo ./workers ./dnsutils ./transformers ./pkgconfig ./pkginit ././ 2>&1 | grep -c RUN) echo "Count of Tests: $data" echo "data=$data" >> $GITHUB_OUTPUT diff --git a/.github/workflows/testing-powerdns.yml b/.github/workflows/testing-powerdns.yml index 8e1a3660..9c8b0345 100644 --- a/.github/workflows/testing-powerdns.yml +++ b/.github/workflows/testing-powerdns.yml @@ -68,11 +68,14 @@ jobs: - name: Deploy Docker image run: | - if [[ "${{ matrix.component.name }}" == "dnsdist" ]]; then - sudo docker run -d --network="host" --name=dnsdist --volume=$PWD/tests/testsdata/powerdns/dnsdist_protobuf.conf:/etc/dnsdist/conf.d/dnsdist.conf:z -v /tmp/:/tmp/ powerdns/dnsdist-${{ matrix.component.version }} - elif [[ "${{ matrix.component.name }}" == "recursor" ]]; then - sudo docker run -d --network="host" --name=recursor --volume=$PWD/tests/testsdata/powerdns/pdns_recursor.yml:/etc/powerdns/recursor.yml:z powerdns/pdns-recursor-${{ matrix.component.version }} - fi + case ${{ matrix.component.name }} in + "dnsdist") + sudo docker run -d --network="host" --name=dnsdist --volume=$PWD/tests/testsdata/powerdns/dnsdist_protobuf.conf:/etc/dnsdist/conf.d/dnsdist.conf:z -v /tmp/:/tmp/ powerdns/dnsdist-${{ matrix.component.version }} + ;; + "recursor") + sudo docker run -d --network="host" --name=recursor --volume=$PWD/tests/testsdata/powerdns/pdns_recursor.yml:/etc/powerdns/recursor.yml:z powerdns/pdns-recursor-${{ matrix.component.version }} + ;; + esac until (dig -p 5553 www.github.com @127.0.0.1 | grep NOERROR); do sleep 5.0; done - name: Test DNS query