Move *_test.go in root directory to integration/client #5101

dims · 2021-03-01T15:35:08Z

This package drags in old versions of a bunch of things transitively.

we should have it in a separate directory and with its own go.mod/go.sum files to avoid cluttering the root go.mod/sum

So it is better to not vendor into our tree a shared object - vendor/github.com/Microsoft/hcsshim/test/functional/manifest/rsrc_amd64.syso - anyone that needs to run the test can still do so and we will avoid having it in our tree.

Signed-off-by: Davanum Srinivas davanum@gmail.com

theopenlab-ci · 2021-03-01T15:37:34Z

Build succeeded.

containerd-build-arm64 : MERGER_FAILURE in 6s (non-voting)

TBBle · 2021-03-01T16:02:26Z

We still need client_windows_test.go, as it defines the base images used by the tests, and a few other constants and functions needed by the integration test suite. It's the Windows-platform equivalent of client_unix_test.go, which populates the same constants and functions for non-Windows builds. It doesn't make sense to remove one and not the other.

If you want to get rid of the use of github.com/Microsoft/hcsshim/test, then what you actually need to do is find another source for rsrc_amd64.syso, as that's the only thing we use from there.

The simplest thing would be to just copy https://github.com/microsoft/hcsshim/tree/master/test/functional/manifest/ into the containerd test suite, the reason I didn't do that previously (#4431) was simply that I didn't want to deal with copyright provenance of a binary blob, and hadn't had time to look into rsrc and //go:generate to make it more copyable.

Alternatively, for the "drags in old versions" concern, perhaps just update the version of github.com/Microsoft/hcsshim/test? I recently revendored containerd into github.com/Microsoft/hcsshim/test with 1.5.0-beta1 so it should be must less "old versions" than it was, and it would 100% make sense to me if containerd's go.mod had a replaces for any uses of github.com/containerd/containerd to be ., since it makes no sense to me for depended-upon modules when building containerd to themselves depend on different containerd.

theopenlab-ci · 2021-03-01T17:07:51Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-01T19:03:18Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-01T19:54:40Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

TBBle · 2021-03-01T23:11:49Z

You will need to change the integration test runner setup in the Makefile, which currently runs github.com/containerd/containerd, to run github.com/containerd/containerd/test/client, as with this PR currently, no tests run in the Integration stages.

This might be a simple change to the value of INTEGRATION_PACKAGE, plus changing the integration: rule to run ${INTEGRATION_PACKAGE} explicitly.

And then, because it appears go list ${GO_TAGS} ./... doesn't cross module boundaries, all the $(filter-out ${INTEGRATION_PACKAGE},XXX) behaviour could be just XXX.

That would certainly be a nice improvement, in my opinion, as I've often gotten lost trying to distinguish integration tests from other tests in the Makefile.

dims · 2021-03-02T19:11:29Z

@TBBle thanks for the tips! trying it out now

theopenlab-ci · 2021-03-02T19:18:56Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 6m 18s (non-voting)

theopenlab-ci · 2021-03-02T19:33:02Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-02T19:38:26Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-02T19:46:55Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-02T20:01:09Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-02T20:29:43Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-02T20:37:18Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-02T20:51:28Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

dims · 2021-03-02T21:29:21Z

@TBBle now i have just the windows CI job failing. all with similar pattern

2021-03-02T21:07:15.2280868Z --- FAIL: TestContainerHostname (7.14s)
2021-03-02T21:07:15.2282218Z     container_test.go:1139: : exec: "D:\\a\\containerd\\containerd\\src\\github.com\\containerd\\containerd\\integration\\client": file does not exist: unknown```

theopenlab-ci · 2021-03-11T21:09:27Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-11T21:10:08Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

dims · 2021-03-11T21:11:33Z

recheck

theopenlab-ci · 2021-03-11T21:11:40Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-11T21:13:32Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

.github/workflows/ci.yml

theopenlab-ci · 2021-03-12T00:06:36Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-12T00:07:46Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

theopenlab-ci · 2021-03-12T00:24:56Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

Will help us drop dependency to github.com/Microsoft/hcsshim/test in the main go.mod Signed-off-by: Davanum Srinivas <davanum@gmail.com>

theopenlab-ci · 2021-03-12T00:28:35Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

dims · 2021-03-12T01:23:34Z

recheck

theopenlab-ci · 2021-03-12T01:25:54Z

Build succeeded.

containerd-build-arm64 : MERGER_FAILURE in 6s (non-voting)

client.go

dmcgowan

LGTM

estesp

LGTM

dims changed the title ~~Drop github.com/Microsoft/hcsshim/test~~ [WIP] Drop github.com/Microsoft/hcsshim/test Mar 1, 2021

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from 734a311 to f4f6620 Compare March 1, 2021 17:02

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch 2 times, most recently from 0f17fd6 to d32ece6 Compare March 1, 2021 19:03

dims changed the title ~~[WIP] Drop github.com/Microsoft/hcsshim/test~~ Move *_test.go in root directory to test/client Mar 1, 2021

dims changed the title ~~Move *_test.go in root directory to test/client~~ [WIP] Move *_test.go in root directory to test/client Mar 1, 2021

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from d32ece6 to 22fa2ac Compare March 1, 2021 19:54

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from 22fa2ac to f8fa159 Compare March 2, 2021 19:11

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from f8fa159 to 85820b3 Compare March 2, 2021 19:32

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from c7bf932 to 7d259bf Compare March 2, 2021 20:00

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from 7d259bf to 4a7d09a Compare March 2, 2021 20:29

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from 4a7d09a to 8a3064d Compare March 2, 2021 20:37

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from 8a3064d to 05b869d Compare March 2, 2021 20:51

mikebrow mentioned this pull request Mar 2, 2021

limiting encrypted image pull to linux for now #5112

Closed

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from f10e3af to 7002d5f Compare March 11, 2021 21:09

dims closed this Mar 11, 2021

dims reopened this Mar 11, 2021

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from 7002d5f to ecd4468 Compare March 11, 2021 21:13

TBBle reviewed Mar 11, 2021

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

TBBle approved these changes Mar 11, 2021

View reviewed changes

dims closed this Mar 12, 2021

dims reopened this Mar 12, 2021

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from ecd4468 to d0fea17 Compare March 12, 2021 00:06

dims closed this Mar 12, 2021

dims reopened this Mar 12, 2021

Separate go module for client tests

6a4aa1e

Will help us drop dependency to github.com/Microsoft/hcsshim/test in the main go.mod Signed-off-by: Davanum Srinivas <davanum@gmail.com>

dims force-pushed the drop-github.com/Microsoft/hcsshim/test branch from d0fea17 to 6a4aa1e Compare March 12, 2021 00:27

dmcgowan reviewed Mar 12, 2021

View reviewed changes

client.go Show resolved Hide resolved

dmcgowan approved these changes Mar 12, 2021

View reviewed changes

estesp approved these changes Mar 12, 2021

View reviewed changes

estesp merged commit a2f5a9d into containerd:master Mar 12, 2021

fuweid mentioned this pull request Mar 24, 2021

integration/client doesn't update go.mod with latest version of containerd #5259

Closed

dmcgowan mentioned this pull request Jan 18, 2022

Remove submodule go mod #6439

Merged

Move *_test.go in root directory to integration/client #5101

Move *_test.go in root directory to integration/client #5101

Uh oh!

Conversation

dims commented Mar 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

theopenlab-ci bot commented Mar 1, 2021

Uh oh!

TBBle commented Mar 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

theopenlab-ci bot commented Mar 1, 2021

Uh oh!

theopenlab-ci bot commented Mar 1, 2021

Uh oh!

theopenlab-ci bot commented Mar 1, 2021

Uh oh!

TBBle commented Mar 1, 2021

Uh oh!

dims commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

theopenlab-ci bot commented Mar 2, 2021

Uh oh!

dims commented Mar 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

theopenlab-ci bot commented Mar 11, 2021

Uh oh!

theopenlab-ci bot commented Mar 11, 2021

Uh oh!

dims commented Mar 11, 2021

Uh oh!

theopenlab-ci bot commented Mar 11, 2021

Uh oh!

theopenlab-ci bot commented Mar 11, 2021

Uh oh!

Uh oh!

theopenlab-ci bot commented Mar 12, 2021

Uh oh!

theopenlab-ci bot commented Mar 12, 2021

Uh oh!

theopenlab-ci bot commented Mar 12, 2021

Uh oh!

theopenlab-ci bot commented Mar 12, 2021

Uh oh!

dims commented Mar 12, 2021

Uh oh!

theopenlab-ci bot commented Mar 12, 2021

Uh oh!

Uh oh!

dmcgowan left a comment

Choose a reason for hiding this comment

Uh oh!

estesp left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

dims commented Mar 1, 2021 •

edited

Loading

TBBle commented Mar 1, 2021 •

edited

Loading

dims commented Mar 2, 2021 •

edited

Loading