Cri integration cleanup by claudiubelu · Pull Request #5287 · containerd/containerd

claudiubelu · 2021-03-30T15:26:31Z

Most of the tests creating and using Pod Sandboxes in the same way. We can create a common function that will do that for us, so we can have less duplicated code, and make it easier to add new tests in the future.

Most tests require pulling a test image, and most of them are doing it in the same way. A function PulImageWithCleanup was introduced in a previous commit. Using it will reduce the amount of duplicated code.

k8s-ci-robot · 2021-03-30T15:26:43Z

Hi @claudiubelu. 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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions 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/test-infra repository.

mikebrow · 2021-03-30T16:41:11Z

hello thanks for the PR work! Can we split this into a separate PR for the two refactoring commits and one for the windows integration work..

FYI on the commits we are limited to one 72 char line for the commit header description..

claudiubelu · 2021-03-30T16:55:42Z

hello thanks for the PR work! Can we split this into a separate PR for the two refactoring commits and one for the windows integration work..

FYI on the commits we are limited to one 72 char line for the commit header description..

Hello. The Windows integration work PR can be seen here: #5163

I've included that commit here to make sure that nothing breaks with any other CI, and that commit was necessary for that.

claudiubelu · 2021-04-13T09:35:07Z

/retest

kzys · 2021-04-21T20:38:29Z

I think we will merge #5403 before this change.

theopenlab-ci · 2021-04-30T10:35:54Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 44s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 24s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 23m 19s (non-voting)

estesp

LGTM

kzys · 2021-05-03T23:50:32Z

/ok-to-test

theopenlab-ci · 2021-05-13T14:53:26Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 48s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 37s (non-voting)
containerd-integration-test-arm64 : FAILURE in 18m 23s (non-voting)

theopenlab-ci · 2021-05-13T15:43:50Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 45s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 36s (non-voting)
containerd-integration-test-arm64 : FAILURE in 21m 51s (non-voting)

theopenlab-ci · 2021-05-17T11:11:58Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 44s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 38s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 21m 35s (non-voting)

theopenlab-ci · 2021-05-17T14:01:34Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 44s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 29s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 22m 03s (non-voting)

mikebrow

see scope comment

theopenlab-ci · 2021-05-18T09:50:09Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 52s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 38s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 18m 42s (non-voting)

mikebrow

LGTM on green

theopenlab-ci · 2021-05-19T10:46:15Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 51s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 33s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 18m 28s (non-voting)

theopenlab-ci · 2021-05-19T11:15:16Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 51s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 24s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 21m 37s (non-voting)

Most of the tests creating and using Pod Sandboxes in the same way. We can create a common function that will do that for us, so we can have less duplicated code, and make it easier to add new tests in the future. Signed-off-by: Claudiu Belu <[email protected]>

A previous commit introduced EnsureImageExists, which ensures that a particular image already exists. It also deduplicates the image pulling code. Some tests missed this update. Signed-off-by: Claudiu Belu <[email protected]>

theopenlab-ci · 2021-06-03T16:26:43Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 39s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 35s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 22m 05s (non-voting)

k8s-ci-robot added the needs-ok-to-test label Mar 30, 2021

claudiubelu force-pushed the cri-integration-cleanup branch 6 times, most recently from 97642ea to ce90f51 Compare April 6, 2021 14:29

claudiubelu force-pushed the cri-integration-cleanup branch 2 times, most recently from e69fd0b to d0429a2 Compare April 12, 2021 19:34

claudiubelu force-pushed the cri-integration-cleanup branch from d0429a2 to 570f963 Compare April 13, 2021 15:35

claudiubelu changed the title ~~WIP: Cri integration cleanup~~ Cri integration cleanup Apr 13, 2021

claudiubelu force-pushed the cri-integration-cleanup branch from 570f963 to 7d09576 Compare April 19, 2021 11:45

claudiubelu force-pushed the cri-integration-cleanup branch 3 times, most recently from 64c6014 to c55fb4c Compare April 30, 2021 10:10

containerd deleted a comment from theopenlab-ci Bot Apr 30, 2021

containerd deleted a comment from k8s-ci-robot Apr 30, 2021

containerd deleted a comment from theopenlab-ci Bot Apr 30, 2021

estesp approved these changes Apr 30, 2021

View reviewed changes

kzys approved these changes May 3, 2021

View reviewed changes

k8s-ci-robot added ok-to-test and removed needs-ok-to-test labels May 3, 2021

claudiubelu force-pushed the cri-integration-cleanup branch from c55fb4c to 763b50c Compare May 13, 2021 14:33

claudiubelu force-pushed the cri-integration-cleanup branch from 763b50c to 523c83b Compare May 13, 2021 15:20

claudiubelu force-pushed the cri-integration-cleanup branch from 523c83b to 294a521 Compare May 17, 2021 10:48

claudiubelu force-pushed the cri-integration-cleanup branch from 294a521 to 3ac9a0e Compare May 17, 2021 13:36

mikebrow reviewed May 17, 2021

View reviewed changes

Comment thread integration/container_stats_test.go Outdated

Comment thread integration/container_stats_test.go Outdated

Comment thread integration/container_stats_test.go Outdated

Comment thread integration/container_stats_test.go Outdated

claudiubelu force-pushed the cri-integration-cleanup branch from 3ac9a0e to 0a46545 Compare May 18, 2021 09:29

mikebrow reviewed May 18, 2021

View reviewed changes

claudiubelu force-pushed the cri-integration-cleanup branch from 0a46545 to 2c2710c Compare May 19, 2021 10:25

claudiubelu force-pushed the cri-integration-cleanup branch from 2c2710c to f937885 Compare May 19, 2021 10:51

claudiubelu added 2 commits June 3, 2021 16:02

tests: Use EnsureImageExists for image pulling

cabe677

A previous commit introduced EnsureImageExists, which ensures that a particular image already exists. It also deduplicates the image pulling code. Some tests missed this update. Signed-off-by: Claudiu Belu <[email protected]>

claudiubelu force-pushed the cri-integration-cleanup branch from f937885 to cabe677 Compare June 3, 2021 16:02

claudiubelu requested a review from mikebrow June 22, 2021 12:07

AkihiroSuda approved these changes Jun 25, 2021

View reviewed changes

AkihiroSuda merged commit e1f2865 into containerd:main Jun 25, 2021

Conversation

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

Uh oh!

Uh oh!

k8s-ci-robot commented Mar 30, 2021

Uh oh!

mikebrow commented Mar 30, 2021

Uh oh!

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

Uh oh!

Uh oh!

claudiubelu commented Apr 13, 2021

Uh oh!

kzys commented Apr 21, 2021

Uh oh!

theopenlab-ci Bot commented Apr 30, 2021

Uh oh!

estesp left a comment

Choose a reason for hiding this comment

Uh oh!

kzys commented May 3, 2021

Uh oh!

theopenlab-ci Bot commented May 13, 2021

Uh oh!

theopenlab-ci Bot commented May 13, 2021

Uh oh!

theopenlab-ci Bot commented May 17, 2021

Uh oh!

theopenlab-ci Bot commented May 17, 2021

Uh oh!

mikebrow left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

theopenlab-ci Bot commented May 18, 2021

Uh oh!

mikebrow left a comment

Choose a reason for hiding this comment

Uh oh!

theopenlab-ci Bot commented May 19, 2021

Uh oh!

theopenlab-ci Bot commented May 19, 2021

Uh oh!

theopenlab-ci Bot commented Jun 3, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

claudiubelu commented Mar 30, 2021 •

edited

Loading

claudiubelu commented Mar 30, 2021 •

edited

Loading