diff --git a/.cirrus.yml b/.cirrus.yml index 826890ad1c..f6530b155d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,13 +87,6 @@ fedora32_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -fedora31_task: - container: - # Fedora 31 EOL: Nov 24 2020 - dockerfile: ci/fedora-31/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - centos8_task: container: # CentOS 8 EOL: May 31, 2029 diff --git a/ci/fedora-31/Dockerfile b/ci/fedora-31/Dockerfile deleted file mode 100644 index bc71a8a795..0000000000 --- a/ci/fedora-31/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -FROM fedora:31 - -RUN yum -y install \ - bison \ - cmake \ - diffutils \ - findutils \ - flex \ - git \ - gcc \ - 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 - -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html