-
Notifications
You must be signed in to change notification settings - Fork 595
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3384 from apostasie/dev-testing-fix
Testing-rig fixes
- Loading branch information
Showing
8 changed files
with
45 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -318,8 +318,8 @@ RUN curl -o nydus-static.tgz -fsSL --proto '=https' --tlsv1.2 "https://github.co | |
tar xzf nydus-static.tgz && \ | ||
mv nydus-static/nydus-image nydus-static/nydusd nydus-static/nydusify /usr/bin/ && \ | ||
rm nydus-static.tgz | ||
CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \ | ||
"--", "-timeout=60m", "-args", "-test.allow-kill-daemon"] | ||
CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=./cmd/nerdctl/...", \ | ||
"--", "-timeout=60m", "-p", "1", "-args", "-test.allow-kill-daemon"] | ||
|
||
FROM test-integration AS test-integration-rootless | ||
# Install SSH for creating systemd user session. | ||
|
@@ -340,20 +340,19 @@ COPY ./Dockerfile.d/[email protected]_delegate.conf /etc/system | |
# ipfs daemon for rootless containerd will be enabled in /test-integration-rootless.sh | ||
RUN systemctl disable test-integration-ipfs-offline | ||
VOLUME /home/rootless/.local/share | ||
RUN go test -o /usr/local/bin/nerdctl.test -c ./cmd/nerdctl | ||
COPY ./Dockerfile.d/test-integration-rootless.sh / | ||
RUN chmod a+rx /test-integration-rootless.sh | ||
CMD ["/test-integration-rootless.sh", \ | ||
"gotestsum", "--format=testname", "--rerun-fails=2", "--raw-command", \ | ||
"--", "/usr/local/go/bin/go", "tool", "test2json", "-t", "-p", "github.com/containerd/nerdctl/v2/cmd/nerdctl", \ | ||
"/usr/local/bin/nerdctl.test", "-test.v", "-test.timeout=60m", "-test.allow-kill-daemon"] | ||
"gotestsum", "--format=testname", "--rerun-fails=2", "--packages=./cmd/nerdctl/...", \ | ||
"--", "-timeout=60m", "-p", "1", "-args", "-test.allow-kill-daemon"] | ||
|
||
# test for CONTAINERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=slirp4netns | ||
FROM test-integration-rootless AS test-integration-rootless-port-slirp4netns | ||
COPY ./Dockerfile.d/home_rootless_.config_systemd_user_containerd.service.d_port-slirp4netns.conf /home/rootless/.config/systemd/user/containerd.service.d/port-slirp4netns.conf | ||
RUN chown -R rootless:rootless /home/rootless/.config | ||
|
||
FROM test-integration AS test-integration-ipv6 | ||
CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \ | ||
"--", "-timeout=60m", "-args", "-test.allow-kill-daemon", "-test.only-ipv6"] | ||
CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=./cmd/nerdctl/...", \ | ||
"--", "-timeout=60m", "-p", "1", "-args", "-test.allow-kill-daemon", "-test.only-ipv6"] | ||
|
||
FROM base AS demo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters