Merge pull request #111 from openwisp/issue109

Issue109

.gitlab-ci.yml

@@ -19,7 +19,7 @@
     name: hashicorp/terraform:light
     entrypoint:
       - '/usr/bin/env'
-      - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'  
+      - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
   before_script:
     - wget -O $CI_PROJECT_DIR/terraform.tf https://gitlab.com/snippets/1757951/raw
     - rm -rf .terraform

.travis.yml

@@ -2,9 +2,7 @@
 
 services: docker
 
-branches:
-  only:
-    - master
+if: (type = pull_request) OR (branch = master)
 
 env:
   matrix:

tests/runtests.sh

@@ -18,9 +18,9 @@ docker exec "${container_id}" curl --insecure -s --head https://localhost/admin/
  && exit 1)
 
 # Check redis is running
-sudo docker exec "${container_id}" systemctl status redis-server \
+docker exec "${container_id}" systemctl status redis-server \
  | grep "Active: active (running)" \
- || sudo docker exec "${container_id}" systemctl status redis \
+ || docker exec "${container_id}" systemctl status redis \
  | grep "Active: active (running)" \
  && (printf "redis test: pass\n" && exit 0) \
  || (printf "redis test: failed\n"; exit 1)