From 48dfb8db9e784604e9c7ad8e1a36cc862dac1b4d Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Thu, 21 Jan 2021 15:39:24 -0800 Subject: Add image presubmit tests and mark fsstress x86_64 only. PiperOrigin-RevId: 353118942 --- .buildkite/pipeline.yaml | 8 ++++++++ images/basic/fsstress/Dockerfile | 17 ----------------- images/basic/fsstress/Dockerfile.x86_64 | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 17 deletions(-) delete mode 100644 images/basic/fsstress/Dockerfile create mode 100644 images/basic/fsstress/Dockerfile.x86_64 diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index cddf5504b..ac0cc4cd9 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -45,6 +45,14 @@ steps: - make BAZEL_OPTIONS=--config=cross-aarch64 artifacts/aarch64 - make release + # Images tests. + - <<: *common + label: ":docker: Images (x86_64)" + command: make ARCH=x86_64 load-all-images + - <<: *common + label: ":docker: Images (aarch64)" + command: make ARCH=aarch64 load-all-images + # Basic unit tests. - <<: *common label: ":test_tube: Unit tests" diff --git a/images/basic/fsstress/Dockerfile b/images/basic/fsstress/Dockerfile deleted file mode 100644 index 21b86065a..000000000 --- a/images/basic/fsstress/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# Usage: docker run --rm fsstress -d /test -n 10000 -p 100 -X -v -FROM alpine - -RUN apk update && apk add git -RUN git clone https://github.com/linux-test-project/ltp.git --depth 1 - -WORKDIR /ltp -RUN ./travis/alpine.sh -RUN make autotools && ./configure -RUN make -C testcases/kernel/fs/fsstress -RUN cp ./testcases/kernel/fs/fsstress/fsstress /usr/bin -RUN rm -rf /fsstress /tmp - -WORKDIR / -# This is required, otherwise running with -p > 1 prematurelly exits. -COPY run.sh . -ENTRYPOINT ["/run.sh"] diff --git a/images/basic/fsstress/Dockerfile.x86_64 b/images/basic/fsstress/Dockerfile.x86_64 new file mode 100644 index 000000000..21b86065a --- /dev/null +++ b/images/basic/fsstress/Dockerfile.x86_64 @@ -0,0 +1,17 @@ +# Usage: docker run --rm fsstress -d /test -n 10000 -p 100 -X -v +FROM alpine + +RUN apk update && apk add git +RUN git clone https://github.com/linux-test-project/ltp.git --depth 1 + +WORKDIR /ltp +RUN ./travis/alpine.sh +RUN make autotools && ./configure +RUN make -C testcases/kernel/fs/fsstress +RUN cp ./testcases/kernel/fs/fsstress/fsstress /usr/bin +RUN rm -rf /fsstress /tmp + +WORKDIR / +# This is required, otherwise running with -p > 1 prematurelly exits. +COPY run.sh . +ENTRYPOINT ["/run.sh"] -- cgit v1.2.3