Skip to content

Commit 10d0659

Browse files
committed
Disable retry
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
1 parent bec95c4 commit 10d0659

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
@@ -82,12 +82,7 @@ jobs:
8282
- name: "Register QEMU (tonistiigi/binfmt)"
8383
run: docker run --privileged --rm tonistiigi/binfmt --install all
8484
- name: "Run integration tests"
85-
uses: nick-fields/retry@v3
86-
with:
87-
timeout_minutes: 30
88-
max_attempts: 2
89-
retry_on: error
90-
command: docker run -t --rm --privileged test-integration
85+
run: docker run -t --rm --privileged test-integration
9186

9287
test-integration-ipv6:
9388
runs-on: "ubuntu-${{ matrix.ubuntu }}"
@@ -131,12 +126,7 @@ jobs:
131126
# On the other side, using the host network is easier at configuration.
132127
# Besides, each job is running on a different instance, which means using host network here
133128
# is safe and has no side effects on others.
134-
uses: nick-fields/retry@v3
135-
with:
136-
timeout_minutes: 30
137-
max_attempts: 2
138-
retry_on: error
139-
command: docker run --network host -t --rm --privileged test-integration-ipv6
129+
run: docker run --network host -t --rm --privileged test-integration-ipv6
140130

141131
test-integration-rootless:
142132
runs-on: "ubuntu-${{ matrix.ubuntu }}"
@@ -199,12 +189,7 @@ jobs:
199189
fi
200190
echo "WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622}" >>$GITHUB_ENV
201191
- name: "Test (network driver=slirp4netns, port driver=builtin)"
202-
uses: nick-fields/retry@v3
203-
with:
204-
timeout_minutes: 30
205-
max_attempts: 2
206-
retry_on: error
207-
command: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET}
192+
run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET}
208193

209194
cross:
210195
runs-on: ubuntu-24.04
@@ -247,19 +232,9 @@ jobs:
247232
run: |
248233
sudo apt-get install -y expect
249234
- name: "Ensure that the integration test suite is compatible with Docker"
250-
uses: nick-fields/retry@v3
251-
with:
252-
timeout_minutes: 30
253-
max_attempts: 2
254-
retry_on: error
255-
command: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon
235+
run: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon
256236
- name: "Ensure that the IPv6 integration test suite is compatible with Docker"
257-
uses: nick-fields/retry@v3
258-
with:
259-
timeout_minutes: 30
260-
max_attempts: 2
261-
retry_on: error
262-
command: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon -test.ipv6
237+
run: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon -test.ipv6
263238

264239
test-integration-windows:
265240
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=30m", "-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=30m", "-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=30m", "-args", "-test.kill-daemon", "-test.ipv6"]
358358

359359
FROM base AS demo

0 commit comments

Comments
 (0)