From 9de9e77ca47527fb54a191ddee02db54e60e6712 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Sat, 16 Feb 2019 13:25:48 +0100
Subject: [PATCH] For Ubuntu, test latest, rolling and devel.

---
 .travis.yml                                               | 8 ++++----
 README.md                                                 | 2 +-
 molecule/default/molecule.yml                             | 6 ++++--
 molecule/{ubuntu-artful => ubuntu-rolling}/Dockerfile.j2  | 0
 molecule/{ubuntu-artful => ubuntu-rolling}/molecule.yml   | 6 +++---
 molecule/{ubuntu-artful => ubuntu-rolling}/playbook.yml   | 0
 .../tests/test_default.yml                                | 0
 molecule/{ubuntu-artful => ubuntu-rolling}/verify.yml     | 0
 8 files changed, 12 insertions(+), 10 deletions(-)
 rename molecule/{ubuntu-artful => ubuntu-rolling}/Dockerfile.j2 (100%)
 rename molecule/{ubuntu-artful => ubuntu-rolling}/molecule.yml (79%)
 rename molecule/{ubuntu-artful => ubuntu-rolling}/playbook.yml (100%)
 rename molecule/{ubuntu-artful => ubuntu-rolling}/tests/test_default.yml (100%)
 rename molecule/{ubuntu-artful => ubuntu-rolling}/verify.yml (100%)

diff --git a/.travis.yml b/.travis.yml
index f486584..0bfe0fe 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 03c8fae..b71245e 100644
--- a/README.md
+++ b/README.md
@@ -93,9 +93,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 275db40..95bc51d 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -34,8 +34,10 @@ platforms:
     image: opensuse:leap
   - name: rsyslog-opensuse-tumbleweed
     image: opensuse:tumbleweed
-  - name: rsyslog-ubuntu-artful
-    image: ubuntu:artful
+  - name: rsyslog-ubuntu-latest
+    image: ubuntu:latest
+  - name: rsyslog-ubuntu-rolling
+    image: ubuntu:rolling
   - name: rsyslog-ubuntu-devel
     image: ubuntu:devel
   - name: rsyslog-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 79%
rename from molecule/ubuntu-artful/molecule.yml
rename to molecule/ubuntu-rolling/molecule.yml
index fbed2a9..f016cdc 100644
--- a/molecule/ubuntu-artful/molecule.yml
+++ b/molecule/ubuntu-rolling/molecule.yml
@@ -8,8 +8,8 @@ driver:
 lint:
   name: yamllint
 platforms:
-  - name: rsyslog-ubuntu-artful
-    image: ubuntu:artful
+  - name: rsyslog-ubuntu-rolling
+    image: ubuntu:rolling
 provisioner:
   name: ansible
   inventory:
@@ -19,7 +19,7 @@ provisioner:
   lint:
     name: ansible-lint
 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