Skip to content

tests: Refactors container image usage#5403

Merged
estesp merged 1 commit intocontainerd:masterfrom
claudiubelu:cri-integration-images
Apr 27, 2021
Merged

tests: Refactors container image usage#5403
estesp merged 1 commit intocontainerd:masterfrom
claudiubelu:cri-integration-images

Conversation

@claudiubelu
Copy link
Copy Markdown
Contributor

@claudiubelu claudiubelu commented Apr 21, 2021

Currently, the cri-integration tests do not work on Windows due to various reasons. One of the reasons is because all the tests are using Linux-specific images. This commit refactors the image pulling / usage in the cri-integration tests, making it
easier to update, and easier to configure the a custom registry to pull those images from.

For Windows runs, custom registries can be created, which will also contain Windows images, and the cri-integration tests can be configured to use those registries by specifying the --image-list argument, a YAML file which will contain an alternative
mapping of the default images.

Signed-off-by: Claudiu Belu [email protected]

@kzys
Copy link
Copy Markdown
Member

kzys commented Apr 21, 2021

/ok-to-test

Comment thread go.mod Outdated
Comment thread integration/common.go Outdated
Comment thread integration/main_test.go Outdated
@claudiubelu claudiubelu force-pushed the cri-integration-images branch from 7cd22c1 to 40d8b9d Compare April 21, 2021 21:17
@claudiubelu claudiubelu force-pushed the cri-integration-images branch from 40d8b9d to 46e8182 Compare April 22, 2021 13:15
Copy link
Copy Markdown
Member

@kzys kzys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! The failure seems unrelated.

@mxpv Could you take a look and merge if it is okay? It will unblock your #5398 :)

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couple comments. I think most of my comments were covered by Maksym's review...

Thanks for the contribution!

Comment thread integration/common.go Outdated
Comment thread integration/common.go Outdated
Comment thread integration/common.go Outdated
@claudiubelu claudiubelu force-pushed the cri-integration-images branch 3 times, most recently from 82893ce to 6d11b40 Compare April 23, 2021 12:53
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment thread integration/repo_list.sample.toml Outdated
@claudiubelu claudiubelu force-pushed the cri-integration-images branch from 6d11b40 to a7692ba Compare April 23, 2021 17:17
Copy link
Copy Markdown
Member

@mxpv mxpv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on green

@claudiubelu claudiubelu force-pushed the cri-integration-images branch from a7692ba to 355b63d Compare April 23, 2021 17:25
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't notice your defaults didn't have :latest on the alpine and busybox entries; causing CRI test failures because it doesn't auto-resolve to use "latest" if untagged ref.

Comment thread integration/common.go Outdated
Comment thread integration/image_list.sample.toml Outdated
@claudiubelu claudiubelu force-pushed the cri-integration-images branch 2 times, most recently from 34cc7a1 to 46393e5 Compare April 23, 2021 22:55
@claudiubelu claudiubelu force-pushed the cri-integration-images branch from 09afdeb to b1c0491 Compare April 26, 2021 15:44
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@claudiubelu
Copy link
Copy Markdown
Contributor Author

Failure is unrelated.

@claudiubelu claudiubelu force-pushed the cri-integration-images branch from b1c0491 to d3eda06 Compare April 26, 2021 20:39
Currently, the cri-integration tests do not work on Windows due to various reasons.
One of the reasons is because all the tests are using Linux-specific images. This
commit refactors the image pulling / usage in the cri-integration tests, making it
easier to update, and easier to configure the a custom registry to pull those images
from.

For Windows runs, custom registries can be created, which will also contain Windows
images, and the cri-integration tests can be configured to use those registries by
specifying the "--image-list" argument, a TOML file which will contain an alternative
mapping of the default images.

Signed-off-by: Claudiu Belu <[email protected]>
@claudiubelu claudiubelu force-pushed the cri-integration-images branch from d3eda06 to 5847340 Compare April 27, 2021 08:44
@claudiubelu
Copy link
Copy Markdown
Contributor Author

/test pull-containerd-node-e2e

2 similar comments
@claudiubelu
Copy link
Copy Markdown
Contributor Author

/test pull-containerd-node-e2e

@estesp
Copy link
Copy Markdown
Member

estesp commented Apr 27, 2021

/test pull-containerd-node-e2e

@claudiubelu
Copy link
Copy Markdown
Contributor Author

recheck

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 27, 2021

Build succeeded.

@estesp
Copy link
Copy Markdown
Member

estesp commented Apr 27, 2021

/test pull-containerd-node-e2e

@containerd containerd deleted a comment from k8s-ci-robot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from theopenlab-ci Bot Apr 27, 2021
@containerd containerd deleted a comment from k8s-ci-robot Apr 27, 2021
@estesp estesp merged commit feee16e into containerd:master Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants