Fixes #896: Update all role versions, especially nodejs.

Author: geerlingguy

provisioning/requirements.yml

@@ -6,37 +6,37 @@
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
-  version: 1.7.2
+  version: 1.7.3
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
-  version: 1.4.1
+  version: 1.4.2
 - src: geerlingguy.daemonize
-  version: 1.1.0
+  version: 1.1.1
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
   version: 1.1.3
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
-  version: 1.0.9
+  version: 1.1.0
 - src: geerlingguy.git
   version: 1.1.1
 - src: geerlingguy.java
-  version: 1.4.0
+  version: 1.4.1
 - src: geerlingguy.mailhog
   version: 2.0.0
 - src: geerlingguy.memcached
   version: 1.0.4
 - src: geerlingguy.mysql
-  version: 2.3.1
+  version: 2.3.2
 - src: geerlingguy.nginx
   version: 1.9.3
 - src: geerlingguy.nodejs
-  version: 3.2.0
+  version: 3.3.0
 - src: geerlingguy.php
   version: 3.2.2
 - src: geerlingguy.php-memcached
@@ -60,10 +60,10 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.3.1
+  version: 2.4.0
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
   version: 3.1.3
 - src: geerlingguy.varnish
-  version: 1.6.1
+  version: 1.6.2

provisioning/roles/geerlingguy.apache/.travis.yml

@@ -2,37 +2,47 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
-    init: /sbin/init
-    run_opts: ""
+  global:
+    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
+    DOCKER_VERSION: "1.9.1-0~trusty"
+  matrix:
+    - repository: geerlingguy/docker-centos7-ansible
+      version: latest
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - repository: geerlingguy/docker-centos6-ansible
+      version: latest
+      init: /sbin/init
+      run_opts: ""
+    - repository: geerlingguy/docker-ubuntu1604-ansible
+      version: latest
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - repository: geerlingguy/docker-ubuntu1404-ansible
+      version: latest
+      init: /sbin/init
+      run_opts: ""
+    - repository: geerlingguy/docker-ubuntu1204-ansible
+      version: latest
+      init: /sbin/init
+      run_opts: ""
 
 services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Downgrade to specific version of Docker engine.
+  - sudo apt-get update
+  - sudo apt-get remove docker-engine -yq
+  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
+
+  # Pull container.
+  - 'sudo docker pull ${repository}:${version}'
 
 script:
   - container_id=$(mktemp)
-    # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+    # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'

provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml

@@ -1,6 +1,6 @@
 ---
 - name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=yes cache_valid_time=3600
 
 - name: Ensure Apache is installed on Debian.
   apt: "name={{ item }} state=installed"

provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6

@@ -2,29 +2,26 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 7
+  - repository: geerlingguy/docker-centos7-ansible
+    version: latest
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
+  - repository: geerlingguy/docker-ubuntu1604-ansible
+    version: latest
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull ${repository}:${version}'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
 
   # Install dependencies.
   - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
@@ -36,16 +33,18 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Ensure Composer is installed and working.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm composer'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm composer || true'
 
-  # Clean up
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications: