From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 3 Nov 2021 10:22:57 +0000 (+0100)
Subject: Separate bulk test deps from regression test deps
X-Git-Tag: rec-4.6.0-beta1~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4467dd85f64766b96a5f6d715cdf7aea5ddb5412;p=thirdparty%2Fpdns.git

Separate bulk test deps from regression test deps
---

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 8bd2917032..731a8095fe 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -335,7 +335,7 @@ jobs:
           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-test-deps
+      - run: inv install-rec-bulk-deps
       - run: inv test-bulk-recursor ${{ matrix.threads }} ${{ matrix.mthreads }} ${{ matrix.shards }}
 
   test-dnsdist-regression:
diff --git a/tasks.py b/tasks.py
index be67db924a..5350513943 100644
--- a/tasks.py
+++ b/tasks.py
@@ -51,6 +51,20 @@ rec_build_deps = [
     'libfstrm-dev',
     'libsnmp-dev',
 ]
+rec_bulk_deps = [
+    'curl',
+    'unzip',
+    'moreutils',
+    'pdns-tools',
+    'libluajit-5.1-2',
+    'libboost-all-dev',
+    'libcap2',
+    'libssl1.1',
+    'libsystemd0',
+    'libsodium23',
+    'libfstrm0',
+    'libsnmp35'
+]
 dnsdist_build_deps = [
     'libcap-dev',
     'libcdb-dev',
@@ -156,23 +170,18 @@ def install_auth_test_deps(c, backend): # FIXME: rename this, we do way more tha
     # FIXME we may want to start a background recursor here to make ALIAS tests more robust
     setup_authbind(c)
 
+@task
+def install_rec_bulk_deps(c): # FIXME: rename this, we do way more than apt-get
+    c.sudo('apt-get --no-install-recommends -qq -y install ' + ' '.join(rec_bulk_deps))
+    c.run('chmod +x /opt/pdns-recursor/bin/* /opt/pdns-recursor/sbin/*')
+
 @task
 def install_rec_test_deps(c): # FIXME: rename this, we do way more than apt-get
-    c.sudo('apt-get --no-install-recommends install -qq -y \
-              pdns-server curl unzip pdns-backend-bind pdns-tools daemontools \
-              jq libfaketime lua-posix lua-socket moreutils bc authbind \
+    c.sudo('apt-get --no-install-recommends install -qq -y ' + ' '.join(rec_bulk_deps) + ' \
+              pdns-server pdns-backend-bind daemontools \
+              jq libfaketime lua-posix lua-socket bc authbind \
               python3-venv python3-dev default-libmysqlclient-dev libpq-dev \
-              libluajit-5.1-2 \
-              libboost-all-dev \
-              libcap2 \
-              libssl1.1 \
-              libsystemd0 \
-              libsodium23 \
-              libfstrm0 \
-              libsnmp35 \
-              protobuf-compiler \
-              snmpd \
-              prometheus')
+              protobuf-compiler snmpd prometheus')
 
     c.run('chmod +x /opt/pdns-recursor/bin/* /opt/pdns-recursor/sbin/*')