Merge "Adds centos-8 testing to install-deps"

molecule/Dockerfile.j2

@@ -1,21 +0,0 @@
-# Molecule managed
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && 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 {{ item.pkg_extras | default('') }} && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
-    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi
-
-{% for pkg in item.easy_install | default([]) %}
-# install pip for centos where there is no python-pip rpm in default repos
-RUN easy_install {{ pkg }}
-{% endfor %}
-
-CMD ["sh", "-c", "while true; do sleep 10000; done"]

molecule/install-deps/molecule.yml

@@ -4,21 +4,25 @@ driver:
 log: true
 platforms:
 
-  - name: centos7-master
-    hostname: centos7-master
+  # Warning: do not put pre-baked images for install-deps role because it will
+  # fail to validate what happens on pure/clean systems.
+  - name: centos7
+    hostname: centos7
     image: centos:7
-    dockerfile: ../Dockerfile.j2
-    pkg_extras: python-setuptools
-    easy_install:
-      - pip
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
 
+  - name: centos8
+    hostname: centos8
+    image: centos:8
+    environment: *env
+
 provisioner:
   name: ansible
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
+
 scenario:
   test_sequence:
     - destroy