Add CentOS 8 to the ansible-pulp CI

Partial implementation fixes: #6262
pulp · Mar 6, 2020 · 56cdde3 · 56cdde3
1 parent ef482ae
commit 56cdde3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -27,6 +27,10 @@ platforms:
     name: centos-7
     image: centos:7
     command: /sbin/init
+  - <<: *platform_base
+    name: centos-8
+    image: centos:8
+    command: /sbin/init
   - <<: *platform_base
     name: debian-10
     image: debian:buster

diff --git a/molecule/dynamic/molecule.yml b/molecule/dynamic/molecule.yml
@@ -27,6 +27,10 @@ platforms:
     name: centos-7
     image: centos:7
     command: /sbin/init
+  - <<: *platform_base
+    name: centos-8
+    image: centos:8
+    command: /sbin/init
   - <<: *platform_base
     name: debian-10
     image: debian:buster

diff --git a/molecule/scenario_resources/Dockerfile.j2 b/molecule/scenario_resources/Dockerfile.j2
@@ -16,7 +16,7 @@ FROM {{ item.image }}
 
 ENV container docker
 
-{% if item.name.startswith('centos') -%}
+{% if item.name.startswith('centos-7') -%}
 
 RUN yum install -y epel-release ;\
 yum makecache fast ;\
@@ -61,9 +61,15 @@ apt-get -y install \
 apt-get clean &&\
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* &&\
 systemctl enable firewalld
-{% elif item.name.startswith('fedora') -%}
+{% else -%}
+# fedora or centos-8
 
-RUN dnf makecache ;\
+# Pulp requires CentOS 8.2 or later. 8.2 is currently CentOS Stream.
+RUN grep -v "CentOS" /etc/redhat-release || dnf install -y centos-release-stream epel-release ;\
+dnf makecache ;\
+grep -v "CentOS Linux release 8.1." /etc/redhat-release || dnf update -y ;\
+grep -v "CentOS Linux release 8.1." /etc/redhat-release || dnf install -y centos-release-stream ;\
+dnf update -y ;\
 dnf --assumeyes install \
   bash \
   firewalld \

diff --git a/molecule/source-dynamic/molecule.yml b/molecule/source-dynamic/molecule.yml
@@ -23,6 +23,10 @@ lint: |
     - NET_ADMIN
     - NET_RAW
 platforms:
+  - <<: *platform_base
+    name: centos-8
+    image: centos:8
+    command: /sbin/init
   - <<: *platform_base
     name: debian-10
     image: debian:buster

diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml
@@ -23,6 +23,10 @@ lint: |
     - NET_ADMIN
     - NET_RAW
 platforms:
+  - <<: *platform_base
+    name: centos-8
+    image: centos:8
+    command: /sbin/init
   - <<: *platform_base
     name: debian-10
     image: debian:buster