Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-1.30] Run libseccomp tests in parallel #5254

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions embedded-bins/runc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,33 @@ ARG BUILDIMAGE
FROM $BUILDIMAGE AS build

RUN apk add build-base git \
curl linux-headers gperf bash pkgconf
curl linux-headers gperf bash pkgconf cmd:tail

ENV GOPATH=/go

ARG LIBSECCOMP_VERSION=2.5.5
RUN curl -L https://github.com/seccomp/libseccomp/releases/download/v$LIBSECCOMP_VERSION/libseccomp-$LIBSECCOMP_VERSION.tar.gz \
| tar -C / -zx

RUN cd /libseccomp-$LIBSECCOMP_VERSION && ./configure --sysconfdir=/etc --enable-static

RUN make -j$(nproc) -C /libseccomp-$LIBSECCOMP_VERSION
RUN make -j$(nproc) -C /libseccomp-$LIBSECCOMP_VERSION check
RUN make -C /libseccomp-$LIBSECCOMP_VERSION install
WORKDIR /libseccomp-$LIBSECCOMP_VERSION
# tests: add basic support for running tests in parallel
RUN curl -L https://github.com/seccomp/libseccomp/commit/2380f5788c692796f75e464c61aa877e5c4eb882.patch \
| git apply
# tests: limit the number of bpf-sim-fuzz test iterations
# https://github.com/seccomp/libseccomp/commit/5878cf2383ccedca3536f47155b13145809ae08e
# the patch didnt apply due to commit touches .travis/
# Use sed instead
RUN sed -i -e 's/50$/5/' tests/*-sim-*.tests

# tests: add support for the LIBSECCOMP_TSTCFG_JOBS env variable
RUN curl -L https://github.com/seccomp/libseccomp/commit/4c19425fa69cfb4f7de5225d676a26ef0b442e28.patch \
| git apply
RUN ./configure --sysconfdir=/etc --enable-static

RUN make -j$(nproc)
RUN make -j$(nproc) check-build
RUN make -C tests check LIBSECCOMP_TSTCFG_JOBS=$(nproc)
RUN make install

ARG VERSION
RUN mkdir -p $GOPATH/src/github.com/opencontainers/runc
Expand Down
Loading