Skip to content

Commit d6747eb

Browse files
committed
Disable retry
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
1 parent 17558b3 commit d6747eb

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

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

139129
test-integration-rootless:
140130
runs-on: "ubuntu-${{ matrix.ubuntu }}"
@@ -197,12 +187,7 @@ jobs:
197187
fi
198188
echo "WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622}" >>$GITHUB_ENV
199189
- name: "Test (network driver=slirp4netns, port driver=builtin)"
200-
uses: nick-fields/retry@v3
201-
with:
202-
timeout_minutes: 30
203-
max_attempts: 2
204-
retry_on: error
205-
command: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET}
190+
run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=${WORKAROUND_ISSUE_622} ${TEST_TARGET}
206191

207192
cross:
208193
runs-on: ubuntu-24.04
@@ -245,19 +230,9 @@ jobs:
245230
run: |
246231
sudo apt-get install -y expect
247232
- name: "Ensure that the integration test suite is compatible with Docker"
248-
uses: nick-fields/retry@v3
249-
with:
250-
timeout_minutes: 30
251-
max_attempts: 2
252-
retry_on: error
253-
command: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon
233+
run: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon
254234
- name: "Ensure that the IPv6 integration test suite is compatible with Docker"
255-
uses: nick-fields/retry@v3
256-
with:
257-
timeout_minutes: 30
258-
max_attempts: 2
259-
retry_on: error
260-
command: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon -test.ipv6
235+
run: go test -timeout 20m -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon -test.ipv6
261236

262237
test-integration-windows:
263238
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)