Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes: fix a bunch of problems in bootstrapping e2e tests. #154

Merged
merged 9 commits into from
Oct 16, 2023

Conversation

klihub
Copy link
Collaborator

@klihub klihub commented Oct 12, 2023

This patch set fixes a bunch of problems and otherwise improves bootstrapping e2e tests. Among other things:

  • test/e2e: install runtime from release tarball
  • test/e2e: don't write broken resolv.conf
  • test/e2e: fix image loading, patching in deployment
  • test/e2e: add support for bridge CNI plugin
  • test/e2e: fix cilium CNI provisioning

@klihub klihub marked this pull request as ready for review October 12, 2023 20:20
@klihub klihub force-pushed the fixes/e2e-tests branch 2 times, most recently from f0af2d0 to 3c11d1e Compare October 13, 2023 07:35
test/e2e/files/10-bridge.conf.in Outdated Show resolved Hide resolved
test/e2e/files/containerd.service Outdated Show resolved Hide resolved
test/e2e/files/crio.service Outdated Show resolved Hide resolved
test/e2e/playbook/provision.yaml Outdated Show resolved Hide resolved
test/e2e/playbook/provision.yaml Show resolved Hide resolved
test/e2e/playbook/provision.yaml Show resolved Hide resolved
test/e2e/playbook/provision.yaml Outdated Show resolved Hide resolved
test/e2e/run.sh Outdated Show resolved Hide resolved
test/self-hosted-runner/docker/runner-in-container.sh Outdated Show resolved Hide resolved
@klihub klihub force-pushed the fixes/e2e-tests branch 4 times, most recently from 525db31 to 0688ca6 Compare October 13, 2023 11:46
Allow installing containerd or CRI-O from a release tarball
or pre-compiled sources. Default to installing from release
tarballs.

Signed-off-by: Krisztian Litkey <[email protected]>
klihub and others added 7 commits October 13, 2023 15:44
Instead, install service file from release tarball, sources,
or using a documented online URL.

Signed-off-by: Krisztian Litkey <[email protected]>
Do not try to unconditionally overwrite /etc/resolv.conf with
$dns_nameserver as the server. If it is unset, don't touch
resolv.conf at all.

Signed-off-by: Krisztian Litkey <[email protected]>
Load plugin images for CRI-O using a single podman import instead
of an import and a podman scp. Fix plugin image reference patching
in test deployment files.

Signed-off-by: Krisztian Litkey <[email protected]>
And make the bridge plugin the default.

Signed-off-by: Krisztian Litkey <[email protected]>
Using the bridge plugins seems to break metrics collection
tests. Revert the default to cilium for now until we figure
out what's wrong and fix it.

Signed-off-by: Krisztian Litkey <[email protected]>
Copy link
Collaborator

@fmuyassarov fmuyassarov left a comment

Choose a reason for hiding this comment

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

Thanks @klihub . LGTM
I must admit that I haven't verified changes by running e2e myself.

Copy link
Collaborator

@askervin askervin left a comment

Choose a reason for hiding this comment

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

Great, thanks @klihub! LGTM.

@askervin askervin merged commit a1d9c97 into containers:main Oct 16, 2023
2 checks passed
@klihub klihub deleted the fixes/e2e-tests branch October 18, 2023 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants