zeek · timwoj · Aug 24, 2023 · Aug 23, 2023 · Aug 23, 2023 · Aug 23, 2023
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -15,16 +15,16 @@ ci_template: &CI_TEMPLATE
 # Linux EOL timelines: https://linuxlifecycle.com/
 # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
 
-fedora37_task:
+fedora38_task:
   container:
-    # Fedora 37 EOL: Around Dec 2024
-    dockerfile: ci/fedora-37/Dockerfile
+    # Fedora 38 EOL: Around May 2024
+    dockerfile: ci/fedora-38/Dockerfile
   << : *CI_TEMPLATE
 
-fedora36_task:
+fedora37_task:
   container:
-    # Fedora 36 EOL: Around May 2023
-    dockerfile: ci/fedora-36/Dockerfile
+    # Fedora 37 EOL: Around Dec 2024
+    dockerfile: ci/fedora-37/Dockerfile
   << : *CI_TEMPLATE
 
 centos7_task:
@@ -57,12 +57,6 @@ debian10_task:
     dockerfile: ci/debian-10/Dockerfile
   << : *CI_TEMPLATE
 
-opensuse_leap_15_3_task:
-  container:
-    # Opensuse Leap 15.3 EOL: Around Dec 22
-    dockerfile: ci/opensuse-leap-15.3/Dockerfile
-  << : *CI_TEMPLATE
-
 opensuse_leap_15_4_task:
   container:
     # Opensuse Leap 15.4 EOL: TBD
@@ -73,6 +67,7 @@ opensuse_tumbleweed_task:
   container:
     # Opensuse Tumbleweed has no EOL
     dockerfile: ci/opensuse-tumbleweed/Dockerfile
+  prepare_script: ./ci/opensuse-tumbleweed/prepare.sh
   << : *CI_TEMPLATE
 
 ubuntu22_task:
@@ -87,12 +82,6 @@ ubuntu20_task:
     dockerfile: ci/ubuntu-20.04/Dockerfile
   << : *CI_TEMPLATE
 
-ubuntu18_task:
-  container:
-    # Ubuntu 18.04 EOL: April 2023
-    dockerfile: ci/ubuntu-18.04/Dockerfile
-  << : *CI_TEMPLATE
-
 # Apple doesn't publish official long-term support timelines.
 # We aim to support both the current and previous macOS release.
 macos_ventura_task:
@@ -117,10 +106,10 @@ freebsd14_task:
   prepare_script: ./ci/freebsd/prepare.sh
   << : *CI_TEMPLATE
 
-freebsd13_1_task:
+freebsd13_task:
   freebsd_instance:
     # FreeBSD 13.1 EOL: TBD (13.2 + 3 months)
-    image_family: freebsd-13-1
+    image_family: freebsd-13-2
   prepare_script: ./ci/freebsd/prepare.sh
   << : *CI_TEMPLATE
 

diff --git a/ci/centos-7/Dockerfile b/ci/centos-7/Dockerfile
@@ -1,5 +1,9 @@
 FROM centos:7
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN yum -y install \
     epel-release \
   && yum clean all && rm -rf /var/cache/yum
@@ -17,14 +21,17 @@ RUN yum -y install \
     cmake3 \
     make \
     libpcap-devel \
-    python3 \
-    python3-pip \
+    rh-python38 \
+    rh-python38-devel \
+    rh-python38-python-devel \
+    rh-python38-pip \
   && yum clean all && rm -rf /var/cache/yum
 
 RUN pip3 install btest
 
 RUN echo 'unset BASH_ENV PROMPT_COMMAND ENV' > /usr/bin/zeek-ci-env && \
-    echo 'source /opt/rh/devtoolset-7/enable' >> /usr/bin/zeek-ci-env
+    echo 'source /opt/rh/devtoolset-7/enable' >> /usr/bin/zeek-ci-env && \
+    echo 'source /opt/rh/rh-python38/enable' >> /usr/bin/zeek-ci-env
 
 ENV BASH_ENV="/usr/bin/zeek-ci-env" \
     ENV="/usr/bin/zeek-ci-env" \

diff --git a/ci/centos-stream-8/Dockerfile b/ci/centos-stream-8/Dockerfile
@@ -1,5 +1,9 @@
 FROM quay.io/centos/centos:stream8
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 RUN dnf config-manager --set-enabled powertools
 
@@ -10,9 +14,9 @@ RUN dnf -y update && dnf -y install \
     gcc-c++ \
     libpcap-devel \
     make \
-    python3 \
-    python3-devel \
-    python3-pip\
+    python38 \
+    python38-devel \
+    python38-pip \
   && dnf clean all && rm -rf /var/cache/dnf
 
 RUN pip3 install btest
diff --git a/ci/centos-stream-9/Dockerfile b/ci/centos-stream-9/Dockerfile
@@ -1,5 +1,9 @@
 FROM quay.io/centos/centos:stream9
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 # 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)'

diff --git a/ci/debian-10/Dockerfile b/ci/debian-10/Dockerfile
@@ -1,5 +1,9 @@
 FROM debian:10
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 ENV CMAKE_DIR "/opt/cmake"

diff --git a/ci/debian-11/Dockerfile b/ci/debian-11/Dockerfile
@@ -1,5 +1,9 @@
 FROM debian:11
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 RUN apt-get update && apt-get -y install \

diff --git a/ci/fedora-36/Dockerfile b/ci/fedora-36/Dockerfile
diff --git a/ci/fedora-37/Dockerfile b/ci/fedora-37/Dockerfile
@@ -1,5 +1,9 @@
 FROM fedora:37
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN dnf -y install \
     cmake \
     diffutils \

diff --git a/ci/fedora-38/Dockerfile b/ci/fedora-38/Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:38
+
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
+RUN dnf -y install \
+    cmake \
+    diffutils \
+    gcc-c++ \
+    git \
+    libpcap-devel \
+    make \
+    python3 \
+    python3-pip\
+  && dnf clean all && rm -rf /var/cache/dnf
+
+RUN pip install btest
diff --git a/ci/opensuse-leap-15.3/Dockerfile b/ci/opensuse-leap-15.3/Dockerfile
diff --git a/ci/opensuse-leap-15.4/Dockerfile b/ci/opensuse-leap-15.4/Dockerfile
@@ -1,5 +1,9 @@
 FROM opensuse/leap:15.4
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN zypper refresh \
  && zypper in -y \
     cmake \
@@ -9,12 +13,15 @@ RUN zypper refresh \
     gzip \
     libpcap-devel \
     make \
-    python3 \
-    python3-pip \
+    python39 \
+    python39-devel \
+    python39-pip \
     tar \
     which \
   && rm -rf /var/cache/zypp
 
+RUN update-alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.9 100
+
 RUN pip3 install btest
 
 RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-10 100

diff --git a/ci/opensuse-tumbleweed/Dockerfile b/ci/opensuse-tumbleweed/Dockerfile
@@ -1,7 +1,12 @@
 FROM opensuse/tumbleweed
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 RUN zypper refresh \
  && zypper in -y \
+    awk \
     cmake \
     diffutils \
     gcc-c++ \
@@ -15,4 +20,4 @@ RUN zypper refresh \
     which \
   && rm -rf /var/cache/zypp
 
-RUN pip install btest
+RUN pip3 install --break-system-packages btest
diff --git a/ci/opensuse-tumbleweed/prepare.sh b/ci/opensuse-tumbleweed/prepare.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+zypper refresh
+zypper patch -y --with-update --with-optional
diff --git a/ci/ubuntu-18.04/Dockerfile b/ci/ubuntu-18.04/Dockerfile
diff --git a/ci/ubuntu-20.04/Dockerfile b/ci/ubuntu-20.04/Dockerfile
@@ -1,5 +1,9 @@
 FROM ubuntu:20.04
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 RUN apt-get update && apt-get -y install \

diff --git a/ci/ubuntu-22.04/Dockerfile b/ci/ubuntu-22.04/Dockerfile
@@ -1,5 +1,9 @@
 FROM ubuntu:22.04
 
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230823
+
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 RUN apt-get update && apt-get -y install \