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-e2e: backport changes in conformance-e2e into v1.13 tests #25386

Merged
merged 1 commit into from
May 12, 2023

Conversation

brb
Copy link
Member

@brb brb commented May 11, 2023

To unblock #25346 let's backport the whole conformance-e2e.yaml to conformance-e2e-v1.13.yaml.

@brb brb added area/CI Continuous Integration testing issue or flake release-note/ci This PR makes changes to the CI. labels May 11, 2023
@brb brb requested review from a team as code owners May 11, 2023 14:04
@brb brb requested a review from brlbil May 11, 2023 14:04
@thorn3r
Copy link
Contributor

thorn3r commented May 11, 2023

/ci-e2e-1.13

@brb
Copy link
Member Author

brb commented May 11, 2023

ci-e2e-1.13

@thorn3r I think it picks from the main branch the GH workflow file. Let me push a WIP commit to run the job from the proposed workflow file.

@thorn3r
Copy link
Contributor

thorn3r commented May 11, 2023

@brb right forgot about that, ty!

@@ -20,7 +20,7 @@ on:
# will disappear from the PR checks: please provide a direct link to the
# successful workflow run (can be found from Actions tab) in a comment.
#
# pull_request: {}
pull_request: {}
Copy link
Contributor

Choose a reason for hiding this comment

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

should this remain commented?

Copy link
Contributor

Choose a reason for hiding this comment

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

nope this was just to get the tests to run here

@thorn3r
Copy link
Contributor

thorn3r commented May 11, 2023

/ci-e2e

@thorn3r
Copy link
Contributor

thorn3r commented May 11, 2023

/ci-e2e-1.13

@thorn3r
Copy link
Contributor

thorn3r commented May 11, 2023

@brb feel free to drop this commit if it's not what you had in mind. I can also move this to a new PR instead.

Bring the conformance-e2e-v1.13 tests to parity with conformance-e2e.
The changes made were prior to the renaming of conformance-datapath to
conformance-e2e, so rather than backporting the commits this commit
copies the changes into conformance-e2e-v1.13

Signed-off-by: Tim Horner <[email protected]>
Signed-off-by: Martynas Pumputis <[email protected]>
@brb brb force-pushed the pr/brb/ci-e2e-1.13-external-cidr branch from 9cfd669 to a305ccf Compare May 12, 2023 06:32
@brb
Copy link
Member Author

brb commented May 12, 2023

@thorn3r Cool, that was my intention for a separate PR, as I didn't want to introduce that many changes to the already broken flow. But considering that all tests have passed (https://github.com/cilium/cilium/actions/runs/4955234361/jobs/8864455590?pr=25386), let's proceed with your changes 🎉 I applied a few small changes to your commit and cleaned up the rest.

@brb brb changed the title ci-e2e: Install external CIDRs for v1.13 encryption tests ci-e2e: backport changes in conformance-e2e into v1.13 tests May 12, 2023
@brb brb requested a review from tommyp1ckles May 12, 2023 06:39
@brb
Copy link
Member Author

brb commented May 12, 2023

@brb brb force-pushed the pr/brb/ci-e2e-1.13-external-cidr branch from c0c4add to a305ccf Compare May 12, 2023 08:21
@brb brb merged commit 93baa34 into main May 12, 2023
@brb brb deleted the pr/brb/ci-e2e-1.13-external-cidr branch May 12, 2023 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake release-note/ci This PR makes changes to the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants