Merge branch 'master' into feature/private-key-creation-idempotence

.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-lint
+  script:
+    - ansible-lint tests/test-docker.yml

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