Merge remote-tracking branch 'origin/topic/johanna/fedora-33-eol'

* origin/topic/johanna/fedora-33-eol:
  Remove Fedora 33 from CI.
This commit is contained in:
Tim Wojtulewicz 2022-01-14 12:22:11 -07:00
commit c6078cd6d5
4 changed files with 7 additions and 31 deletions

View file

@ -108,13 +108,6 @@ fedora34_task:
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
fedora33_task:
container:
# Fedora 33 EOL: Around November 2022
dockerfile: ci/fedora-33/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
centosstream8_task: centosstream8_task:
container: container:
# Stream 8 support should be 5 years, so until 2024. but I cannot find a concrete timeline --cpk # Stream 8 support should be 5 years, so until 2024. but I cannot find a concrete timeline --cpk

View file

@ -1,3 +1,9 @@
5.0.0-dev.47 | 2022-01-14 12:22:11 -0700
* Remove Fedora 33 from CI. (Johanna Amann, Corelight)
EOL date was 20211130
5.0.0-dev.45 | 2022-01-14 12:21:25 -0700 5.0.0-dev.45 | 2022-01-14 12:21:25 -0700
* Have `make dist` cleanup a few more wayward files before tarring (Tim Wojtulewicz, Corelight) * Have `make dist` cleanup a few more wayward files before tarring (Tim Wojtulewicz, Corelight)

View file

@ -1 +1 @@
5.0.0-dev.45 5.0.0-dev.47

View file

@ -1,23 +0,0 @@
FROM fedora:33
RUN dnf -y install \
bison \
cmake \
diffutils \
findutils \
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