build-and-test-all.yml: skip dnsdist eBPF regression tests if skipXDP=True

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 5fb0b63e174119e28327575b74af5ffb4094041a..2c71cb4a3a06bab82af06d3b5cdcc2065562e8c1 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -792,7 +792,7 @@ jobs:
           . ${REPO_HOME}/.venv/bin/activate && pip install -r ${REPO_HOME}/meson/requirements.txt
       - run: ${{ env.INV_CMD }} install-clang-runtime
       - run: ${{ env.INV_CMD }} install-dnsdist-test-deps $([ "$(. /etc/os-release && echo $VERSION_CODENAME)" = "bullseye" ] && echo "--skipXDP=True")
-      - run: ${{ env.INV_CMD }} test-dnsdist
+      - run: ${{ env.INV_CMD }} test-dnsdist $([ "$(. /etc/os-release && echo $VERSION_CODENAME)" = "bullseye" ] && echo "--skipXDP=True")
       - run: ${{ env.INV_CMD }} generate-coverage-info /opt/dnsdist/bin/dnsdist $GITHUB_WORKSPACE
         if: ${{ env.COVERAGE == 'yes' && matrix.sanitizers != 'tsan' }}
       - name: Coveralls Parallel dnsdist regression

diff --git a/tasks.py b/tasks.py
index e1972a27b809455e5c759d28b6ffb01ac62d718b..53de26e037087fbfefbd975e1a9dc750d7b00f62 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -1155,13 +1155,14 @@ def test_ixfrdist(c):
     with c.cd('regression-tests.ixfrdist'):
         c.run('IXFRDISTBIN=/opt/pdns-auth/bin/ixfrdist ./runtests')
 
-@task
-def test_dnsdist(c):
+@task(optional=['skipXDP'])
+def test_dnsdist(c, skipXDP=False):
+    test_env_vars = 'ENABLE_SUDO_TESTS=1' if not skipXDP else ''
     c.run('chmod +x /opt/dnsdist/bin/*')
     c.run('ls -ald /var /var/agentx /var/agentx/master')
     c.run('ls -al /var/agentx/master')
     with c.cd('regression-tests.dnsdist'):
-        c.run('DNSDISTBIN=/opt/dnsdist/bin/dnsdist LD_LIBRARY_PATH=/opt/dnsdist/lib/ ENABLE_SUDO_TESTS=1 ./runtests')
+        c.run(f'DNSDISTBIN=/opt/dnsdist/bin/dnsdist LD_LIBRARY_PATH=/opt/dnsdist/lib/ {test_env_vars} ./runtests')
 
 @task
 def test_regression_recursor(c):