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

ci/conformance: Various image-related fixes #16715

Merged

Conversation

gandro
Copy link
Member

@gandro gandro commented Jun 30, 2021

This PR contains two commits (see description), fixing two issues around the usage of our CI images:

  • Pull in the correct version of clustermesh-apiserver-ci in the clustermesh test
  • Wait for hubble-relay-ci and clustermesh-apiserver-ci where needed

This PR is tested in #16714

Pull in the correct image version built as part of CI when deploying
`clustermesh-apiserver`.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
This commit extends the conformance tests (all of which are using
`cilium hubble enable` to deploy Hubble Relay) to also wait for the
`hubble-relay-ci` image to be built.

In the multicluster test, we also wait for the
`clustermesh-apiserver-ci` image.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro added area/CI-improvement Topic or proposal to improve the Continuous Integration workflow release-note/ci This PR makes changes to the CI. labels Jun 30, 2021
@gandro
Copy link
Member Author

gandro commented Jul 1, 2021

Runs from the validation PR:

Not all of them are green, but since this is an improvement over the status quo and the steps affected by this PR do have passed, I think we should not block the merge of this PR.

@gandro gandro marked this pull request as ready for review July 1, 2021 11:57
@gandro gandro requested review from a team as code owners July 1, 2021 11:57
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Thanks!

Copy link
Member

@nbusseneau nbusseneau left a comment

Choose a reason for hiding this comment

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

Thanks!

@gandro
Copy link
Member Author

gandro commented Jul 1, 2021

Marking this ready-to-merge, exempt from the merge freeze, as it is improving/fixing CI flakes.

@gandro gandro added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 1, 2021
@joestringer joestringer merged commit 8cfb1f8 into cilium:master Jul 1, 2021
@joestringer
Copy link
Member

Do we need equivalent changes on 1.10?

@gandro
Copy link
Member Author

gandro commented Jul 5, 2021

Do we need equivalent changes on 1.10?

Yes. From a first glance, looks like this patch however also requires #16363. Marking both for backport.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI-improvement Topic or proposal to improve the Continuous Integration workflow ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants