Fix broken Fedora 27 test, clean up uninstall task.

geerlingguy · Oct 23, 2018 · d3afc01 · d3afc01
1 parent a42939b
commit d3afc01
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,11 @@ env:
     - ROLE_NAME: docker
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: ubuntu1404
-      MOLECULE_DOCKER_COMMAND: /sbin/init
     - MOLECULE_DISTRO: debian9
-    # - MOLECULE_DISTRO: fedora27
-    #   MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: fedora27
 
 install:
   # Install test dependencies.

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:

diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
@@ -1,11 +1,10 @@
 ---
 - name: Ensure old versions of Docker are not installed.
   package:
-    name: '{{ item }}'
+    name:
+      - docker
+      - docker-engine
     state: absent
-  with_items:
-    - docker
-    - docker-engine
 
 - name: Ensure dependencies are installed.
   apt:

diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
@@ -1,12 +1,11 @@
 ---
 - name: Ensure old versions of Docker are not installed.
   package:
-    name: '{{ item }}'
+    name:
+      - docker
+      - docker-common
+      - docker-engine
     state: absent
-  with_items:
-    - docker
-    - docker-common
-    - docker-engine
 
 - name: Add Docker GPG key.
   rpm_key: