Merge pull request #1 from 0ta2/fix-molecule-test

Fix molecule test

.github/workflows/cron_molecule.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        MOLECULE_DISTRO: ['centos:centos7']
+        MOLECULE_DISTRO: ['centos:centos7', 'centos:centos8']
         python-version: ['3.5']
 
     steps:

.github/workflows/molecule.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        MOLECULE_DISTRO: ['centos:centos7']
+        MOLECULE_DISTRO: ['centos:centos7', 'centos:centos8']
         python-version: ['3.5']
 
     steps:

README.md

@@ -5,7 +5,7 @@
 repo_epel_role
 =========
 
-repoリポジトリをインストールするためのロールです。
+epelリポジトリをインストールするためのロールです。
 
 Requirements
 ------------

meta/main.yml

@@ -7,6 +7,7 @@ galaxy_info:
     - name: EL
       versions:
         - 7
+        - 8
   galaxy_tags:
     - epel
     - package

molecule/default/Dockerfile.j2

@@ -6,17 +6,12 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-{% if item.env is defined %}
-{% for var, value in item.env.items() %}
-{% if value %}
-ENV {{ var }} {{ value }}
-{% endif %}
-{% endfor %}
-{% endif %}
+ARG testarg=fail
+ENV envarg=$testarg
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 python-apt aptitude && apt-get clean; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates iproute2 python3-apt aptitude systemd-sysv && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 sudo bash iproute && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y /usr/bin/python /usr/bin/python2-config sudo yum-plugin-ovl bash iproute && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml iproute2 && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
-    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates iproute2 && xbps-remove -O; fi
+    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python3 sudo bash iproute2 && zypper clean -a; \
+    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python3 sudo bash ca-certificates; \
+    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python3 sudo bash ca-certificates iproute2 && xbps-remove -O; fi

molecule/default/converge.yml

@@ -0,0 +1,8 @@
+---
+- name: Converge
+  hosts: all
+
+  tasks:
+    - name: "Include repo_epel_role"
+      include_role:
+        name: "repo_epel_role"

molecule/default/molecule.yml

@@ -3,15 +3,12 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: instance
     image: ${MOLECULE_DISTRO:-centos:7}
     privileged: True
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    command: /sbin/init
+provisioner:
+  name: ansible
 verifier:
   name: ansible
-  lint:
-    name: ansible-lint

molecule/default/verify.yml

@@ -1,14 +1,12 @@
 ---
-# This is an example playbook to execute Ansible tests.
-
 - name: Verify
   hosts: all
   tasks:
-  - name: Check Installed a EPEL Package.
+  - name: Check Installed a epel-release package.
     package_facts:
       manager: auto
 
-  - name: Test if EPEL Package is installed.
+  - name: Test if epel-release is installed.
     assert:
       that:
         - "'epel-release' in ansible_facts.packages"