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

[e2e] Keep ubuntu:20.04 image #4493

Closed
wants to merge 1 commit into from
Closed

Conversation

gran-vmv
Copy link
Contributor

Fix issue caused by #4459
Some images rely on ubuntu:20.04, keep the manual pulling step in e2e.

Signed-off-by: gran gran@vmware.com

Fix issue caused by antrea-io#4459
Some images rely on ubuntu:20.04, keep the manual pulling step in e2e.

Signed-off-by: gran <gran@vmware.com>
@codecov
Copy link

codecov bot commented Dec 19, 2022

Codecov Report

Merging #4493 (75f2d51) into main (113fe92) will increase coverage by 0.14%.
The diff coverage is n/a.

❗ Current head 75f2d51 differs from pull request most recent head 4415a03. Consider uploading reports for the commit 4415a03 to get more accurate results

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4493      +/-   ##
==========================================
+ Coverage   67.87%   68.01%   +0.14%     
==========================================
  Files         402      402              
  Lines       57284    57284              
==========================================
+ Hits        38879    38960      +81     
+ Misses      15707    15632      -75     
+ Partials     2698     2692       -6     
Flag Coverage Δ *Carryforward flag
e2e-tests 38.28% <ø> (?)
integration-tests 34.60% <ø> (ø) Carriedforward from 113fe92
kind-e2e-tests 47.54% <ø> (ø) Carriedforward from 113fe92
unit-tests 56.44% <ø> (ø) Carriedforward from 113fe92

*This pull request uses carry forward flags. Click here to find out more.

Impacted Files Coverage Δ
...ntroller/networkpolicy/networkpolicy_controller.go 73.54% <0.00%> (+0.20%) ⬆️
pkg/agent/controller/networkpolicy/fqdn.go 74.68% <0.00%> (+0.89%) ⬆️
pkg/ovs/ovsconfig/ovs_client.go 67.07% <0.00%> (+2.55%) ⬆️
pkg/agent/agent.go 57.19% <0.00%> (+3.70%) ⬆️
...gent/controller/noderoute/node_route_controller.go 63.19% <0.00%> (+3.90%) ⬆️

@XinShuYang
Copy link
Contributor

/test-ipv6-e2e
/test-ipv6-only-e2e
/test-all
/test-latest-all
/test-windows-all

@XinShuYang
Copy link
Contributor

/test-ipv6-e2e

@@ -114,9 +114,12 @@ echo "BUILD_TAG: $BUILD_TAG"
# new base images in the build chain.
if $PULL; then
if [[ ${DOCKER_REGISTRY} == "" ]]; then
docker pull $PLATFORM_ARG ubuntu:20.04
Copy link
Member

Choose a reason for hiding this comment

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

I don't find any the following steps in the script needing ubuntu:20.04. I guess this patch fixes the test because this script runs first and caches the image on the Node, which resolves the problem but is not good for long term maintenance.
Could you point out where ubuntu:20.04 is needed? Perhaps there is a better place to pull the images.

cc @antoninbas

Copy link
Contributor

Choose a reason for hiding this comment

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

this script is just to build Antrea and there is no longer a dependencies on ubuntu 20.04 for building Antrea itself.
If some tests require ubuntu 20.04 to be pulled, then the test scripts should take care of pulling the image. As Quan pointed out, this doesn't seem like the right place to do it.

Note that I am planning to upgrade the base image to ubuntu 22.04 for the rest of the container images today (Flow Aggregator, ...).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, currently flexible-ipam-e2e will fail when building Flow Aggregator image, since it will pull ubuntu:20.04 from dockerhub and will get rate limit error. If we'll update other images to ubuntu:22.04, we can retry after that PR merged.

@gran-vmv
Copy link
Contributor Author

#4499 will remove remaining ubuntu:20.04 image.
This PR can be closed after #4499 verified and merged.

@antoninbas
Copy link
Contributor

Closing because #4499 has been merged

@antoninbas antoninbas closed this Dec 20, 2022
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.

4 participants