[release/1.7 backport] testutil: avoid conflict with continuity/testutil#10956
Conversation
|
Hi @sondavidb. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
Assuming the backport is accepted, do we also want to backport this to release/1.6? I see that 1.6 still uses v0.3.0 of continuity but since this error will appear if the upstream consumer uses continutiy v0.4.4 it might still be worth backporting to 1.6. Open to discuss this. |
|
Vangrant tests failing setup from some dependency things, AFAIK this isn't related to my change? Integration test failures are TestContainerdRestart, TestSnapshotterSuite, and TestContainerOutput. The first two exist already in the latest version (https://github.com/containerd/containerd/actions/runs/11334593317) so I think it's ok? |
|
Will need #10965 to be merged to fix vagrant |
```
=== FAIL: core/metadata (0.00s)
/tmp/go-build142702247/b1061/metadata.test flag redefined: test.root
panic: /tmp/go-build142702247/b1061/metadata.test flag redefined: test.root
goroutine 1 [running]:
flag.(*FlagSet).Var(0xc0000d6000, {0x132a040, 0x190f3f3}, {0x11b4291, 0x9}, {0x11c7690, 0x1e})
/opt/hostedtoolcache/go/1.23.2/x64/src/flag/flag.go:1028 +0x54d
flag.BoolVar(...)
/opt/hostedtoolcache/go/1.23.2/x64/src/flag/flag.go:755
github.com/containerd/containerd/v2/pkg/testutil.init.0()
/home/runner/work/containerd/containerd/pkg/testutil/helpers.go:36 +0x6b
FAIL github.com/containerd/containerd/v2/core/metadata 0.028s
```
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 588b7a1)
Signed-off-by: David Son <davbson@amazon.com>
c9f289a to
4bd411f
Compare
Backports fix #10901 to release 1.7.
Currently any upstream consumers importing libraries both containerd 1.7 and the newest continuity (v0.4.4) will experience the same issue, so without this fix an upgrade is impossible.