From 404c43e36c24b57e31048b7c04ad6494d332114a Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Fri, 14 Jan 2022 19:09:00 -0800
Subject: [PATCH 1/3] CI update: add CentOS Stream 9

---
 .cirrus.yml                   |  9 ++++++++-
 ci/centos-stream-9/Dockerfile | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 ci/centos-stream-9/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index e91b0091b7..458f734d5a 100644
--- a/.cirrus.yml
+++ b/.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
diff --git a/ci/centos-stream-9/Dockerfile b/ci/centos-stream-9/Dockerfile
new file mode 100644
index 0000000000..0ad201521d
--- /dev/null
+++ b/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

From 1de58030f2054c3f2d14958140059d9339c70dfc Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Fri, 14 Jan 2022 19:16:47 -0800
Subject: [PATCH 2/3] CI update: remove OpenSUSE Leap 15.2 (EOL)

---
 .cirrus.yml                      |  7 -------
 ci/opensuse-leap-15.2/Dockerfile | 25 -------------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 ci/opensuse-leap-15.2/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index 458f734d5a..490102b7fd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -167,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
diff --git a/ci/opensuse-leap-15.2/Dockerfile b/ci/opensuse-leap-15.2/Dockerfile
deleted file mode 100644
index 7b23204cde..0000000000
--- a/ci/opensuse-leap-15.2/Dockerfile
+++ /dev/null
@@ -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

From 8e24f848575877948095adaa788fa8d654107cd5 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Fri, 14 Jan 2022 19:55:18 -0800
Subject: [PATCH 3/3] CI update: add Ubuntu 21.10

---
 .cirrus.yml                |  7 +++++++
 ci/ubuntu-21.10/Dockerfile | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 ci/ubuntu-21.10/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index 490102b7fd..65d1ef8b06 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -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
diff --git a/ci/ubuntu-21.10/Dockerfile b/ci/ubuntu-21.10/Dockerfile
new file mode 100644
index 0000000000..4a51a122e9
--- /dev/null
+++ b/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