From ad8960f60401953f9d57809bc3add378487bf039 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 19 May 2022 21:31:53 -0700 Subject: [PATCH] Allow to run packetdrill and fsstress tests on arm64 PiperOrigin-RevId: 449900552 --- images/basic/fsstress/{Dockerfile.x86_64 => Dockerfile} | 2 +- test/packetdrill/packetdrill_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename images/basic/fsstress/{Dockerfile.x86_64 => Dockerfile} (95%) diff --git a/images/basic/fsstress/Dockerfile.x86_64 b/images/basic/fsstress/Dockerfile similarity index 95% rename from images/basic/fsstress/Dockerfile.x86_64 rename to images/basic/fsstress/Dockerfile index 21b86065a..a6222a052 100644 --- a/images/basic/fsstress/Dockerfile.x86_64 +++ b/images/basic/fsstress/Dockerfile @@ -5,7 +5,7 @@ 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 ./ci/alpine.sh RUN make autotools && ./configure RUN make -C testcases/kernel/fs/fsstress RUN cp ./testcases/kernel/fs/fsstress/fsstress /usr/bin diff --git a/test/packetdrill/packetdrill_test.sh b/test/packetdrill/packetdrill_test.sh index d25cad83a..77d2cbf30 100755 --- a/test/packetdrill/packetdrill_test.sh +++ b/test/packetdrill/packetdrill_test.sh @@ -117,7 +117,7 @@ declare -r CTRL_PORT="40000" # Last bits of the test runner's IP address. declare -r TEST_RUNNER_NET_SUFFIX=".20" declare -r TIMEOUT="60" -declare -r IMAGE_TAG="gcr.io/gvisor-presubmit/packetdrill" +declare -r IMAGE_TAG="gvisor.dev/images/packetdrill" # Make sure that docker is installed. docker --version