From: romeroalx <alexis.romero@open-xchange.com>
Date: Thu, 30 Jan 2025 13:23:16 +0000 (+0100)
Subject: build-and-test-all.yml: skip dnsdist eBPF regression tests if skipXDP=True
X-Git-Tag: dnsdist-2.0.0-alpha1~107^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73f1ff6021cd99cd403478975b86c9432d2249a2;p=thirdparty%2Fpdns.git

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 5fb0b63e17..2c71cb4a3a 100644
--- 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 e1972a27b8..53de26e037 100644
--- 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):