diff --git a/.travis.yml b/.travis.yml index be40a13..78b14cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,9 @@ env: - version=">=2.6,<2.7" distro="opensuse-tumbleweed" - version="" distro="opensuse-tumbleweed" - version="devel" distro="opensuse-tumbleweed" - - version=">=2.6,<2.7" distro="ubuntu-artful" - - version="" distro="ubuntu-artful" - - version="devel" distro="ubuntu-artful" + - version=">=2.6,<2.7" distro="ubuntu-rolling" + - version="" distro="ubuntu-rolling" + - version="devel" distro="ubuntu-rolling" - version=">=2.6,<2.7" distro="ubuntu-latest" - version="" distro="ubuntu-latest" - version="devel" distro="ubuntu-latest" @@ -70,7 +70,7 @@ matrix: - env: version="devel" distro="fedora-rawhide" - env: version="devel" distro="opensuse-leap" - env: version="devel" distro="opensuse-tumbleweed" - - env: version="devel" distro="ubuntu-artful" + - env: version="devel" distro="ubuntu-rolling" - env: version=">=2.6,<2.7" distro="ubuntu-devel" - env: version="" distro="ubuntu-devel" - env: version="devel" distro="ubuntu-devel" diff --git a/README.md b/README.md index befd0e4..01ff39b 100644 --- a/README.md +++ b/README.md @@ -121,9 +121,9 @@ This role has been tested against the following distributions and Ansible versio |fedora-rawhide*|yes|yes|yes*| |opensuse-leap|yes|yes|yes*| |opensuse-tumbleweed|yes|yes|yes*| -|ubuntu-artful|yes|yes|yes*| |ubuntu-devel*|yes|yes|yes*| |ubuntu-latest|yes|yes|yes*| +|ubuntu-rolling|yes|yes|yes*| A single star means the build may fail, it's marked as an experimental build. diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 0f27079..966b6b1 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -34,8 +34,10 @@ platforms: image: opensuse:leap - name: httpd-opensuse-tumbleweed image: opensuse:tumbleweed - - name: httpd-ubuntu-artful - image: ubuntu:artful + - name: httpd-ubuntu-latest + image: ubuntu:latest + - name: httpd-ubuntu-rolling + image: ubuntu:rolling - name: httpd-ubuntu-devel image: ubuntu:devel - name: httpd-ubuntu-latest diff --git a/molecule/ubuntu-artful/Dockerfile.j2 b/molecule/ubuntu-rolling/Dockerfile.j2 similarity index 100% rename from molecule/ubuntu-artful/Dockerfile.j2 rename to molecule/ubuntu-rolling/Dockerfile.j2 diff --git a/molecule/ubuntu-artful/molecule.yml b/molecule/ubuntu-rolling/molecule.yml similarity index 84% rename from molecule/ubuntu-artful/molecule.yml rename to molecule/ubuntu-rolling/molecule.yml index 0e32181..396f33d 100644 --- a/molecule/ubuntu-artful/molecule.yml +++ b/molecule/ubuntu-rolling/molecule.yml @@ -8,8 +8,8 @@ driver: lint: name: yamllint platforms: - - name: httpd-ubuntu-artful - image: ubuntu:artful + - name: httpd-ubuntu-rolling + image: ubuntu:rolling provisioner: name: ansible inventory: @@ -22,7 +22,7 @@ provisioner: defaults: callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks scenario: - name: ubuntu-artful + name: ubuntu-rolling verifier: name: goss lint: diff --git a/molecule/ubuntu-artful/playbook.yml b/molecule/ubuntu-rolling/playbook.yml similarity index 100% rename from molecule/ubuntu-artful/playbook.yml rename to molecule/ubuntu-rolling/playbook.yml diff --git a/molecule/ubuntu-artful/tests/test_default.yml b/molecule/ubuntu-rolling/tests/test_default.yml similarity index 100% rename from molecule/ubuntu-artful/tests/test_default.yml rename to molecule/ubuntu-rolling/tests/test_default.yml diff --git a/molecule/ubuntu-artful/verify.yml b/molecule/ubuntu-rolling/verify.yml similarity index 100% rename from molecule/ubuntu-artful/verify.yml rename to molecule/ubuntu-rolling/verify.yml