Merge branch 'test-ubuntu1804'

Author: geerlingguy

.travis.yml

@@ -17,6 +17,9 @@ env:
       CONTAINER_ID: dvm-test
 
   matrix:
+    # Defaults - Ubuntu 18.04.
+    - type: defaults
+      distro: ubuntu1804
     # Defaults - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604

provisioning/roles/drupalvm.hostname/meta/main.yml

@@ -16,11 +16,7 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - precise
-        - raring
-        - saucy
-        - trusty
-        - xenial
+        - all
 
   galaxy_tags:
     - drupal

provisioning/roles/drupalvm.hostname/tasks/main.yml

@@ -3,7 +3,9 @@
   copy:
     content: "{{ hostname_fqdn }}\n"
     dest: /etc/mailname
-  when: ansible_os_family == 'Debian'
+  when:
+    - ansible_os_family == 'Debian'
+    - hostname_fqdn != ''
 
 - name: Add hostname to /etc/hosts.
   lineinfile:
@@ -12,15 +14,19 @@
     line: "127.0.0.1\t{{ hostname_fqdn }}\t{{ hostname_short }}"
     state: present
     unsafe_writes: "{{ hostname_unsafe_writes }}"
+  when: hostname_fqdn != ''
 
 - name: Configure hostname.
   copy:
     content: "{{ (ansible_os_family == 'Debian') | ternary(hostname_short, hostname_fqdn) }}\n"
     dest: /etc/hostname
     unsafe_writes: "{{ hostname_unsafe_writes }}"
   register: set_hostname
+  when: hostname_fqdn != ''
 
 - name: Set the hostname for current session.
   command: hostname --file /etc/hostname
-  when: set_hostname.changed
+  when:
+    - set_hostname is changed
+    - hostname_fqdn != ''
   tags: ['skip_ansible_lint']

tests/initctl_faker

@@ -26,6 +26,10 @@ if [ $distro = 'centos7' ]; then
 elif [ $distro = 'centos6' ]; then
   init="/sbin/init"
   opts="--privileged"
+# Ubuntu 18.04
+elif [ $distro = 'ubuntu1804' ]; then
+  init="/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # Ubuntu 16.04
 elif [ $distro = 'ubuntu1604' ]; then
   init="/lib/systemd/systemd"

tests/run-tests.sh

@@ -10,12 +10,3 @@
     - name: Install test dependencies (RedHat).
       package: name=logrotate state=present
       when: ansible_os_family == 'RedHat'
-
-    - name: Copy initctl_faker into place for Ubuntu 14.04.
-      copy:
-        src: initctl_faker
-        dest: /sbin/initctl
-        mode: 0755
-        force: yes
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-      changed_when: false