diff --git a/.travis.yml b/.travis.yml index 3cd14bb..eea3856 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,23 +3,60 @@ sudo: required services: - docker env: - global: - - playbook: opensource - - playbook: template - - playbook: upload - matrix: - - distribution: centos - version: 6 - - distribution: centos - version: 7 - - distribution: ubuntu - version: trusty - - distribution: ubuntu - version: xenial - - distribution: debian - version: jessie - - distribution: debian - version: stretch + - distribution: centos + version: 6 + playbook: opensource + - distribution: centos + version: 6 + playbook: template + - distribution: centos + version: 6 + playbook: push + - distribution: centos + version: 7 + playbook: opensource + - distribution: centos + version: 7 + playbook: template + - distribution: centos + version: 7 + playbook: push + - distribution: ubuntu + version: trusty + playbook: opensource + - distribution: ubuntu + version: trusty + playbook: template + - distribution: ubuntu + version: trusty + playbook: push + - distribution: ubuntu + version: xenial + playbook: opensource + - distribution: ubuntu + version: xenial + playbook: template + - distribution: ubuntu + version: xenial + playbook: push + - distribution: debian + version: jessie + playbook: opensource + - distribution: debian + version: jessie + playbook: template + - distribution: debian + version: jessie + playbook: push + - distribution: debian + version: stretch + playbook: opensource + - distribution: debian + version: stretch + playbook: template + - distribution: debian + version: stretch + playbook: push before_install: - 'sudo docker pull ${distribution}:${version}' - 'sudo docker build --no-cache --rm --file=tests/dockerfiles/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests' diff --git a/tests/playbooks/nginx-upload.yml b/tests/playbooks/nginx-push.yml similarity index 88% rename from tests/playbooks/nginx-upload.yml rename to tests/playbooks/nginx-push.yml index 66db643..92b753b 100644 --- a/tests/playbooks/nginx-upload.yml +++ b/tests/playbooks/nginx-push.yml @@ -7,5 +7,5 @@ vars: main_push_enable: true main_push_location: ../files/nginx.conf - http_push_enable: false + http_push_enable: true http_push_location: ../files/http/*.conf