Merge branch 'topic/christian/ci-updates'

* topic/christian/ci-updates:
  CI update: add Ubuntu 21.10
  CI update: remove OpenSUSE Leap 15.2 (EOL)
  CI update: add CentOS Stream 9

.cirrus.yml

@@ -108,9 +108,16 @@ fedora34_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+centosstream9_task:
+  container:
+    # Stream 9 EOL: Around Dec 2027
+    dockerfile: ci/centos-stream-9/Dockerfile
+    << : *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
+    # Stream 8 EOL: May 31, 2024
     dockerfile: ci/centos-stream-8/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
@@ -160,13 +167,6 @@ debian9_32bit_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-opensuse_leap_15_2_task:
-  container:
-    # Opensuse Leap 15.2 EOL: Dec 2021
-    dockerfile: ci/opensuse-leap-15.2/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-
 opensuse_leap_15_3_task:
   container:
     # Opensuse Leap 15.3 EOL: TBD
@@ -174,6 +174,13 @@ opensuse_leap_15_3_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+ubuntu21_task:
+  container:
+    # Ubuntu 21.10 EOL: July 2022
+    dockerfile: ci/ubuntu-21.10/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 ubuntu20_task:
   container:
     # Ubuntu 20.04 EOL: April 2025

CHANGES

@@ -1,3 +1,11 @@
+5.0.0-dev.65 | 2022-01-24 13:41:25 -0800
+
+  * CI updates (Christian Kreibich, Corelight)
+
+    - add Ubuntu 21.10
+    - remove OpenSUSE Leap 15.2 (EOL)
+    - add CentOS Stream 9
+
 5.0.0-dev.61 | 2022-01-17 10:35:15 +0000
 
   * fix for adding a non-managed type to an empty vector (Vern Paxson, Corelight)

VERSION

@@ -1 +1 @@
-5.0.0-dev.61
+5.0.0-dev.65

ci/centos-stream-9/Dockerfile

@@ -0,0 +1,36 @@
+FROM quay.io/centos/centos:stream9
+
+# dnf config-manager isn't available at first, and
+# we need it to install the CRB repo below.
+RUN dnf -y install 'dnf-command(config-manager)'
+
+# What used to be powertools is now called "CRB".
+# We need it for some of the packages installed below.
+# https://docs.fedoraproject.org/en-US/epel/
+RUN dnf config-manager --set-enabled crb
+RUN dnf -y install \
+    https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
+    https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm
+
+# The --nobest flag is hopefully temporary. Without it we currently hit
+# package versioning conflicts around OpenSSL.
+RUN dnf -y --nobest install \
+    bison \
+    cmake \
+    diffutils \
+    flex \
+    git \
+    gcc \
+    gcc-c++ \
+    libpcap-devel \
+    make \
+    openssl-devel \
+    python3-devel \
+    python3-pip\
+    sqlite \
+    swig \
+    which \
+    zlib-devel \
+  && dnf clean all && rm -rf /var/cache/dnf
+
+RUN pip3 install junit2html

ci/opensuse-leap-15.2/Dockerfile

@@ -1,25 +0,0 @@
-FROM opensuse/leap:15.2
-
-RUN zypper in -y \
-  cmake \
-  make \
-  gcc \
-  gcc-c++ \
-  python3 \
-  python3-devel \
-  flex \
-  bison \
-  libpcap-devel \
-  libopenssl-devel \
-  zlib-devel \
-  swig \
-  git \
-  curl \
-  python3-pip \
-  which \
-  gzip \
-  tar \
-  && rm -rf /var/cache/zypp
-
-
-RUN pip3 install junit2html

ci/ubuntu-21.10/Dockerfile

@@ -0,0 +1,33 @@
+FROM ubuntu:21.10
+
+ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
+
+RUN apt-get update && apt-get -y install \
+    git \
+    cmake \
+    make \
+    gcc \
+    g++ \
+    flex \
+    bison \
+    libpcap-dev \
+    libssl-dev \
+    python3 \
+    python3-dev \
+    python3-pip\
+    swig \
+    zlib1g-dev \
+    libmaxminddb-dev \
+    libkrb5-dev \
+    bsdmainutils \
+    sqlite3 \
+    curl \
+    wget \
+    unzip \
+    ruby \
+    bc \
+    lcov \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install junit2html
+RUN gem install coveralls-lcov