From 564abebe864c9463d103ce0baba87690068e2dc1 Mon Sep 17 00:00:00 2001
From: Hispanico <marco@ingmg.com>
Date: Mon, 22 Oct 2018 14:32:38 +0200
Subject: [PATCH 1/3] [bug] Removed sudo command in runtest.sh

---
 tests/runtests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/runtests.sh b/tests/runtests.sh
index c56e1b8c..1977320a 100755
--- a/tests/runtests.sh
+++ b/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)

From a853c0a0b604c7fd455f6a992196ed43453febc7 Mon Sep 17 00:00:00 2001
From: Hispanico <marco@ingmg.com>
Date: Mon, 22 Oct 2018 15:07:15 +0200
Subject: [PATCH 2/3] [qa] Set travis build only on Master and PR

---
 .gitlab-ci.yml | 2 +-
 .travis.yml    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da2bc296..d8a952a4 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/.travis.yml b/.travis.yml
index 80f73460..338cc557 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,7 @@
 
 services: docker
 
-branches:
-  only:
-    - master
+if: (type = pull_request) OR branch = master
 
 env:
   matrix:

From 11a6ec7e6f38ea42f964ddd1b0de32aaeff3dd98 Mon Sep 17 00:00:00 2001
From: Hispanico <marco@ingmg.com>
Date: Mon, 22 Oct 2018 15:11:00 +0200
Subject: [PATCH 3/3] [qa] Set travis build only on Master and PR

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 338cc557..0b07cfa1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 
 services: docker
 
-if: (type = pull_request) OR branch = master
+if: (type = pull_request) OR (branch = master)
 
 env:
   matrix: