diff --git a/.cirrus.yml b/.cirrus.yml index 3dc4b8548a..b46bc5ffd5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -251,6 +251,14 @@ opensuse_leap_15_5_task: dockerfile: ci/opensuse-leap-15.5/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE + << : *SKIP_TASK_ON_PR + +opensuse_leap_15_6_task: + container: + # Opensuse Leap 15.6 EOL: ~Dec 2025 + dockerfile: ci/opensuse-leap-15.6/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE opensuse_tumbleweed_task: container: diff --git a/CHANGES b/CHANGES index 3f34a63c54..0030bcdc26 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +7.0.0-dev.121 | 2024-04-17 09:20:53 -0700 + + * Add Opensuse leap 15.6 to CI (Johanna Amann, Corelight) + 7.0.0-dev.119 | 2024-04-15 17:52:44 +0200 * Bump Spicy. (Robin Sommer, Corelight) diff --git a/VERSION b/VERSION index aec4efd5d7..8713b63c8c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.119 +7.0.0-dev.121 diff --git a/ci/opensuse-leap-15.6/Dockerfile b/ci/opensuse-leap-15.6/Dockerfile new file mode 100644 index 0000000000..af753098de --- /dev/null +++ b/ci/opensuse-leap-15.6/Dockerfile @@ -0,0 +1,39 @@ +FROM opensuse/leap:15.6 + +# 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 20230905 + +RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.6:Update/standard/openSUSE:Leap:15.6:Update.repo \ + && zypper refresh \ + && zypper in -y \ + bison \ + ccache \ + cmake \ + curl \ + flex \ + gcc12 \ + gcc12-c++ \ + git \ + gzip \ + libopenssl-devel \ + libpcap-devel \ + make \ + openssh \ + python312 \ + python312-devel \ + python312-pip \ + swig \ + tar \ + which \ + zlib-devel \ + && rm -rf /var/cache/zypp + +RUN update-alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.12 100 +RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 100 +RUN update-alternatives --install /usr/bin/python3-config python3-config /usr/bin/python3.12-config 100 + +RUN pip3 install websockets junit2html + +RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-12 100 +RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-12 100