Merge remote-tracking branch 'origin/topic/christian/ci-add-centos-stream'

* origin/topic/christian/ci-add-centos-stream:
  Minor Fedora 32/33 updates in CI
  Add CentOS Stream 8 to CI

.cirrus.yml

@@ -104,6 +104,13 @@ fedora32_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+centosstream8_task:
+  container:
+    # Stream 8 support should be 5 years, so until 2024. but I cannot find a concrete timeline --cpk
+    dockerfile: ci/centos-stream-8/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 centos8_task:
   container:
     # CentOS 8 EOL: May 31, 2029

CHANGES

@@ -1,3 +1,16 @@
+4.1.0-dev.258 | 2021-02-24 15:10:51 -0700
+
+  * Minor Fedora 32/33 updates in CI
+
+    - Switch Fedora package management from yum to dnf, the default
+    - Minimize set of requested RPMs (Christian Kreibich, Corelight)
+
+  * Add CentOS Stream 8 to CI
+
+    There's no official Docker image on the Docker Hub, it's on quay.io:
+    https://quay.io/repository/centos/centos?tab=tags
+
+    At the moment, "Stream" and "Stream 8" are synonymous. (Christian Kreibich, Corelight)
 
 4.1.0-dev.255 | 2021-02-24 12:35:47 -0800
 

VERSION

@@ -1 +1 @@
-4.1.0-dev.255
+4.1.0-dev.258

ci/centos-stream-8/Dockerfile

@@ -0,0 +1,23 @@
+FROM quay.io/centos/centos:stream8
+
+RUN dnf config-manager --set-enabled powertools
+
+RUN dnf -y install \
+    bison \
+    cmake \
+    diffutils \
+    flex \
+    git \
+    gcc \
+    gcc-c++ \
+    libpcap-devel \
+    make \
+    openssl-devel \
+    python3-devel \
+    python3-pip\
+    sqlite \
+    swig \
+    zlib-devel \
+  && dnf clean all && rm -rf /var/cache/dnf
+
+RUN pip3 install junit2html

ci/fedora-32/Dockerfile

@@ -1,6 +1,6 @@
 FROM fedora:32
 
-RUN yum -y install \
+RUN dnf -y install \
     bison \
     cmake \
     diffutils \
@@ -11,15 +11,13 @@ RUN yum -y install \
     gcc-c++ \
     libpcap-devel \
     make \
-    openssl \
     openssl-devel \
-    python3 \
     python3-devel \
     python3-pip\
     sqlite \
     swig \
     which \
     zlib-devel \
-  && yum clean all && rm -rf /var/cache/yum
+  && dnf clean all && rm -rf /var/cache/dnf
 
 RUN pip3 install junit2html

ci/fedora-33/Dockerfile

@@ -1,6 +1,6 @@
 FROM fedora:33
 
-RUN yum -y install \
+RUN dnf -y install \
     bison \
     cmake \
     diffutils \
@@ -11,15 +11,13 @@ RUN yum -y install \
     gcc-c++ \
     libpcap-devel \
     make \
-    openssl \
     openssl-devel \
-    python3 \
     python3-devel \
     python3-pip\
     sqlite \
     swig \
     which \
     zlib-devel \
-  && yum clean all && rm -rf /var/cache/yum
+  && dnf clean all && rm -rf /var/cache/dnf
 
 RUN pip3 install junit2html