]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Use sudo to setup the interfaces when CI job is not running as root
authorOndřej Surý <ondrej@sury.org>
Tue, 2 Jul 2019 10:23:56 +0000 (12:23 +0200)
committerOndřej Surý <ondrej@sury.org>
Tue, 2 Jul 2019 20:43:53 +0000 (22:43 +0200)
(cherry picked from commit 4d3e7d0b7d3d552aeae40f3c74e213b5013cff7d)

.gitlab-ci.yml

index 773cf57ebefe2ba19927f62ed3f613b33c32cd64..776cea8fba4e80b706611ca3a7a8cbcd17ce0651 100644 (file)
@@ -122,13 +122,23 @@ stages:
     untracked: true
     expire_in: "1 hour"
 
+.setup_interfaces: &setup_interfaces |
+    if [ "$(id -u)" -eq "0" ]; then
+      bash -x bin/tests/system/ifconfig.sh up;
+    else
+      sudo bash -x bin/tests/system/ifconfig.sh up;
+    fi
+
+.setup_softhsm: &setup_softhsm |
+    bash -x util/prepare-softhsm2.sh
+
 .system_test: &system_test_job
   <<: *default_triggering_rules
   stage: test
   retry: 2
   before_script:
-    - bash -x bin/tests/system/ifconfig.sh up
-    - bash -x util/prepare-softhsm2.sh
+    - *setup_interfaces
+    - *setup_softhsm
   script:
     - ( cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
     - test -s bin/tests/system/systests.output