diff --git a/.cirrus.yml b/.cirrus.yml index d7b80888ce..b0d0127565 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -249,16 +249,6 @@ debian10_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -opensuse_leap_15_4_task: - container: - # Opensuse Leap 15.4 EOL: ~Dec 2023 - dockerfile: ci/opensuse-leap-15.4/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - << : *SKIP_TASK_ON_PR - env: - ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG - opensuse_leap_15_5_task: container: # Opensuse Leap 15.5 EOL: ~Dec 2024 diff --git a/ci/opensuse-leap-15.4/Dockerfile b/ci/opensuse-leap-15.4/Dockerfile deleted file mode 100644 index 8f95ebb085..0000000000 --- a/ci/opensuse-leap-15.4/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -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 20230801 - -RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.4:Update/standard/openSUSE:Leap:15.4:Update.repo \ - && zypper refresh \ - && zypper in -y \ - bison \ - ccache \ - cmake \ - curl \ - flex \ - gcc10 \ - gcc10-c++ \ - git \ - gzip \ - libopenssl-devel \ - libpcap-devel \ - make \ - openssh \ - python39 \ - python39-devel \ - python39-pip \ - swig \ - tar \ - which \ - zlib-devel \ - && rm -rf /var/cache/zypp - -RUN update-alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.9 100 -RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 100 -RUN update-alternatives --install /usr/bin/python3-config python3-config /usr/bin/python3.9-config 100 - -RUN pip3 install websockets junit2html - -RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-10 100 -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-10 100