Skip to content

Commit eba00db

Browse files
committed
Disable test retries
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
1 parent 4bac741 commit eba00db

File tree

2 files changed

+8
-33
lines changed

2 files changed

+8
-33
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,7 @@ jobs:
9393
docker run --privileged --rm tonistiigi/binfmt --install linux/arm64
9494
docker run --privileged --rm tonistiigi/binfmt --install linux/arm/v7
9595
- name: "Run integration tests"
96-
uses: nick-fields/retry@v3
97-
with:
98-
timeout_minutes: 30
99-
max_attempts: 2
100-
retry_on: error
101-
command: docker run -t --rm --privileged test-integration
96+
run: docker run -t --rm --privileged test-integration
10297

10398
test-integration-ipv6:
10499
runs-on: "ubuntu-${{ matrix.ubuntu }}"
@@ -149,12 +144,7 @@ jobs:
149144
# On the other side, using the host network is easier at configuration.
150145
# Besides, each job is running on a different instance, which means using host network here
151146
# is safe and has no side effects on others.
152-
uses: nick-fields/retry@v3
153-
with:
154-
timeout_minutes: 30
155-
max_attempts: 2
156-
retry_on: error
157-
command: docker run --network host -t --rm --privileged test-integration-ipv6
147+
run: docker run --network host -t --rm --privileged test-integration-ipv6
158148

159149
test-integration-rootless:
160150
runs-on: "ubuntu-${{ matrix.ubuntu }}"
@@ -224,12 +214,7 @@ jobs:
224214
fi
225215
echo "WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622}" >>$GITHUB_ENV
226216
- name: "Test (network driver=slirp4netns, port driver=builtin)"
227-
uses: nick-fields/retry@v3
228-
with:
229-
timeout_minutes: 30
230-
max_attempts: 2
231-
retry_on: error
232-
command: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET}
217+
run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET}
233218

234219
cross:
235220
runs-on: ubuntu-24.04
@@ -279,19 +264,9 @@ jobs:
279264
run: |
280265
sudo apt-get install -y expect
281266
- name: "Ensure that the integration test suite is compatible with Docker"
282-
uses: nick-fields/retry@v3
283-
with:
284-
timeout_minutes: 30
285-
max_attempts: 2
286-
retry_on: error
287-
command: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon
267+
run: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon
288268
- name: "Ensure that the IPv6 integration test suite is compatible with Docker"
289-
uses: nick-fields/retry@v3
290-
with:
291-
timeout_minutes: 30
292-
max_attempts: 2
293-
retry_on: error
294-
command: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon -test.ipv6
269+
run: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon -test.ipv6
295270

296271
test-integration-windows:
297272
runs-on: windows-2022

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ RUN curl -o nydus-static.tgz -fsSL --proto '=https' --tlsv1.2 "https://github.co
318318
tar xzf nydus-static.tgz && \
319319
mv nydus-static/nydus-image nydus-static/nydusd nydus-static/nydusify /usr/bin/ && \
320320
rm nydus-static.tgz
321-
CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \
321+
CMD ["gotestsum", "--format=testname", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \
322322
"--", "-timeout=60m", "-args", "-test.kill-daemon"]
323323

324324
FROM test-integration AS test-integration-rootless
@@ -343,7 +343,7 @@ VOLUME /home/rootless/.local/share
343343
RUN go test -o /usr/local/bin/nerdctl.test -c ./cmd/nerdctl
344344
COPY ./Dockerfile.d/test-integration-rootless.sh /
345345
CMD ["/test-integration-rootless.sh", \
346-
"gotestsum", "--format=testname", "--rerun-fails=2", "--raw-command", \
346+
"gotestsum", "--format=testname", "--raw-command", \
347347
"--", "/usr/local/go/bin/go", "tool", "test2json", "-t", "-p", "github.com/containerd/nerdctl/v2/cmd/nerdctl", \
348348
"/usr/local/bin/nerdctl.test", "-test.v", "-test.timeout=60m", "-test.kill-daemon"]
349349

@@ -353,7 +353,7 @@ COPY ./Dockerfile.d/home_rootless_.config_systemd_user_containerd.service.d_port
353353
RUN chown -R rootless:rootless /home/rootless/.config
354354

355355
FROM test-integration AS test-integration-ipv6
356-
CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \
356+
CMD ["gotestsum", "--format=testname", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \
357357
"--", "-timeout=60m", "-args", "-test.kill-daemon", "-test.ipv6"]
358358

359359
FROM base AS demo

0 commit comments

Comments
 (0)