Merge pull request #2 from chtitux/fix-ci

Fix Travis CI

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
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 1ffbc33672f1d8eadda433bb184bae170241337c..7a72289e592acf3b57890195c94e72d9bba027cb 100644 (file)
--- 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 292c910adac74e8b7f7b496bbca42ef47a2a53b7..b5f4ea1afb2fbe26443977c29581f457b3c5a1e6 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2302edae31b44da92e28582707b403fd7ad1342e 100644 (file)
--- a/test/hosts
+++ b/test/hosts
@@ -0,0 +1 @@
+localhost ansible_connection=local

diff --git a/test/main.yml b/test/main.yml
index e1731ac0f4873793ad788dd71aeb090a491c56c6..625819985ceff6bc51a2714e843851aeaf98987f 100644 (file)
--- 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 1b1155c1f457a1b69b1035ffaec71072cb716306..4c72838cade4f12dc55e8a1d1c88ffe43a22aeb9 100644 (file)
--- 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 (symlink)
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 (symlink)
index f47fac4..0000000
--- a/test/roles/postgresql
+++ /dev/null
@@ -1 +0,0 @@
-../../../postgresql
\ No newline at end of file