updated ciscript to package including manpagednscurve_detection

4 files changed, 13 insertions, 16 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c887403..62407cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,23 +8,22 @@ run-build_deb:
   stage: build_deb
   script:
     - apt update
-    - apt install -y python-all python3-stdeb
-    # remove this
+    - apt install -y python-all python3-stdeb git
     - python3 setup.py --command-package=stdeb.command sdist_dsc
-    - cp helpers/ascension.1 deb_dist/ascension*/debian/
-    - cd deb_dist/ascension*/
+    - cd deb_dist/*/ || exit
+    - cp ../../helpers/ascension.1 debian/ascension.1
+    - echo "debian/ascension.1" > debian/python3-ascension.manpages
+    - dh_installman
     - dpkg-buildpackage -rfakeroot -uc -us
-    - apt update
-    - apt install -y ../python3-ascension*.deb
+    - cd ../../ || exit
+    - apt install -y ./deb_dist/python3-ascension*.deb
     - ascension -h
-    - cd ../../
     - bash helpers/gnunet-installer-0.11-debian.sh Production
     - apt install -y bind9 dnsutils procps
     - gnunet-arm -Esq
     - cd ascension/test/
     - bash test_ascension_simple.sh
     - gnunet-arm -e
-    - cd ../../
   artifacts:
     paths:
       - deb_dist/python3-ascension*.deb
diff --git a/ascension/test/basic_named.conf b/ascension/test/basic_named.conf
index 920e7af..608e7cb 100644
--- a/ascension/test/basic_named.conf
+++ b/ascension/test/basic_named.conf
@@ -8,10 +8,6 @@ options {
     // Add this for no IPv4:
     // listen-on { none; };
 
-    allow-recursion { 127.0.0.1; };
-    allow-transfer { 127.0.0.1; };
-    allow-update { none; };
-
     version none;
     hostname none;
     server-id none;
diff --git a/ascension/test/test_ascension_simple.sh b/ascension/test/test_ascension_simple.sh
index 47fd298..b3cc123 100644
--- a/ascension/test/test_ascension_simple.sh
+++ b/ascension/test/test_ascension_simple.sh
@@ -32,7 +32,7 @@ if ! [ -x "$(command -v gnunet-arm)" ]; then
     exit 1
 fi
 
-gnunet-arm -T 1s -I
+gnunet-arm -T 1s -I -q 2>&1 /dev/null
 if [ "$?" -ne 0 ]; then
     echo "The gnunet peer is not running" >&2
     exit 1
diff --git a/helpers/ciscript.sh b/helpers/ciscript.sh
index 30774d3..3ad40e1 100644
--- a/helpers/ciscript.sh
+++ b/helpers/ciscript.sh
@@ -5,10 +5,12 @@
 apt update
 apt install -y python-all python3-stdeb git
 python3 setup.py --command-package=stdeb.command sdist_dsc
-cd deb_dist/*/
-cp helpers/ascension.1 deb_dist/ascension*/debian/
+cd deb_dist/*/ || exit
+cp ../../helpers/ascension.1 debian/ascension.1
+echo "debian/ascension.1" > debian/python3-ascension.manpages
+dh_installman
 dpkg-buildpackage -rfakeroot -uc -us
-cd ../../
+cd ../../ || exit
 apt install -y ./deb_dist/python3-ascension*.deb
 ascension -h
 bash helpers/gnunet-installer-0.11-debian.sh Production