From fd552334b7884eee2aaf9bbfd45cf90b2c608c9f Mon Sep 17 00:00:00 2001
From: Emmanouil Kampitakis <info+git@kampitakis.de>
Date: Mon, 18 Feb 2019 00:39:24 +0100
Subject: [PATCH 1/3] Add Gitlab-Ci

---
 .gitlab-ci.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..4fc1ea3
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+---
+# -*- coding: utf-8 -*-
+
+before_script:
+  - apt-get update -qy
+  - apt-get install -y python-dev python-pip
+  - git submodule update --init
+  - pip install --upgrade ansible ansible-lint
+  - ansible --version
+  - ansible-lint --version
+
+stages:
+  - ansible-lint
+  - ansible-syntax-check
+
+ansible-lint-pip:
+  stage: ansible-lint
+  script:
+    - ansible-lint tests/test-pip.yml
+
+ansible-lint-docker:
+  stage: ansible-docker
+  script:
+    - ansible-lint tests/test-docker.yml

From c988a6be8964b9b138f37c41db1b6fe4c696d353 Mon Sep 17 00:00:00 2001
From: Emmanouil Kampitakis <info+git@kampitakis.de>
Date: Mon, 18 Feb 2019 00:41:46 +0100
Subject: [PATCH 2/3] Fix typo in gitlab-ci docker

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fc1ea3..5d3ed4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,6 @@ ansible-lint-pip:
     - ansible-lint tests/test-pip.yml
 
 ansible-lint-docker:
-  stage: ansible-docker
+  stage: ansible-lint
   script:
     - ansible-lint tests/test-docker.yml

From 9a85f32686f892ecc2e5fe27e86ff3303ed66bb0 Mon Sep 17 00:00:00 2001
From: Emmanouil Kampitakis <info+git@kampitakis.de>
Date: Mon, 18 Feb 2019 00:47:45 +0100
Subject: [PATCH 3/3] Make the linter happy

---
 tasks/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 6ea1b0e..6608935 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,8 @@
 - name: check that sypervision and deployment are compatible
   fail:
     msg: "Either both or neither of deployment and supervision method should be docker."
-  when: (matrix_synapse_supervision_method == "docker" and matrix_synapse_deployment_method != "docker") or (matrix_synapse_deployment_method == "docker" and matrix_synapse_supervision_method != "docker")
+  when: (matrix_synapse_supervision_method == "docker" and matrix_synapse_deployment_method != "docker") or
+        (matrix_synapse_deployment_method == "docker" and matrix_synapse_supervision_method != "docker")
 
 - name: configure synapse
   import_tasks: configure.yml