From: Théophile Helleboid - chtitux <chtitux@gmail.com>
Date: Fri, 9 Nov 2018 15:35:20 +0000 (+0100)
Subject: Merge pull request #2 from chtitux/fix-ci
X-Git-Tag: 1.1.0~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5a084b7b21ac88f96ad36f0254c9e27666d41a02;hp=e4dc49c472514ed083e5935758acc08df5ee959e;p=github%2Ffretlink%2Fansible-postgresql-role.git

Merge pull request #2 from chtitux/fix-ci

Fix Travis CI
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..58411a3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+test/main.retry
+test/roles/*
+!test/roles/ansible-postgresql-role
diff --git a/.travis.yml b/.travis.yml
index 1ffbc33..7a72289 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,11 @@ install:
   - pip install ansible
   # Check ansible version
   - ansible --version
+  - ansible-galaxy install -r test/requirements.yml -p test/roles/
 
 script:
   # Basic role syntax check
-  - ansible-playbook test/main.yml -i test --syntax-check
+  - ansible-playbook test/main.yml -i test/hosts --syntax-check
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/README.md b/README.md
index 292c910..b5f4ea1 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This role has been tested on Ansible 2.3.0 and higher.
 To install:
 
 ```
-ansible-galaxy install trainline-eu.postgresql
+ansible-galaxy install trainline-eu.ansible_postgresql_role
 ```
 
 
@@ -18,7 +18,7 @@ ansible-galaxy install trainline-eu.postgresql
 No dependencies
 
 Recommended dependencies:
-- trainline-eu.barman
+- trainline-eu.ansible_barman_role
 
 #### Compatibility matrix
 
diff --git a/test/hosts b/test/hosts
index e69de29..2302eda 100644
--- a/test/hosts
+++ b/test/hosts
@@ -0,0 +1 @@
+localhost ansible_connection=local
diff --git a/test/main.yml b/test/main.yml
index e1731ac..6258199 100644
--- a/test/main.yml
+++ b/test/main.yml
@@ -132,7 +132,7 @@
     postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}"
   pre_tasks: *pre_tasks
   roles:
-    - { role: postgresql, tags: ['postgres'] }
+    - { role: ansible-postgresql-role, tags: ['postgres'] }
   tasks:
     - name: Start postgres cluster
       service: name=postgresql state=started
@@ -151,4 +151,4 @@
     postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}"
   pre_tasks: *pre_tasks
   roles:
-    - { role: postgresql, tags: ['postgres'] }
+    - { role: ansible-postgresql-role, tags: ['postgres'] }
diff --git a/test/requirements.yml b/test/requirements.yml
index 1b1155c..4c72838 100644
--- a/test/requirements.yml
+++ b/test/requirements.yml
@@ -1,3 +1,6 @@
 - src: chrismeyersfsu.provision_docker
   name: provision_docker
   version: 7a6243dfcf69f9d262877eca487bc14b62ba6960
+- src: trainline-eu.ansible_barman_role
+  name: barman
+  version: 1.0.0
diff --git a/test/roles/ansible-postgresql-role b/test/roles/ansible-postgresql-role
new file mode 120000
index 0000000..af2d79b
--- /dev/null
+++ b/test/roles/ansible-postgresql-role
@@ -0,0 +1 @@
+../../../ansible-postgresql-role
\ No newline at end of file
diff --git a/test/roles/postgresql b/test/roles/postgresql
deleted file mode 120000
index f47fac4..0000000
--- a/test/roles/postgresql
+++ /dev/null
@@ -1 +0,0 @@
-../../../postgresql
\ No newline at end of file