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

Trim e2e skip regexes for Cilium #15753

Merged
merged 1 commit into from
Aug 12, 2023

Conversation

johngmyers
Copy link
Member

Closes #15448

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 7, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 7, 2023
@johngmyers
Copy link
Member Author

/test pull-kops-e2e-cni-cilium
/test pull-kops-e2e-cni-cilium-ipv6
/test pull-kops-e2e-cni-cilium-etcd
/test pull-kops-e2e-cni-cilium-eni

@johngmyers johngmyers changed the title Trim e2e skip regexes for Cilium WIP Trim e2e skip regexes for Cilium Aug 7, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 7, 2023
@rifelpet
Copy link
Member

rifelpet commented Aug 7, 2023

The kops master branch is used to build kubetest2-kops for all e2e jobs including upgrade tests that upgrade to older kops versions that still use cilium 1.12. This change will stop skipping those tests for cilium 1.12 clusters which will cause failures.

https://github.com/kubernetes/test-infra/blob/17464456700f8d6158e5957e81b2472d6eb0e02a/config/jobs/kubernetes/kops/kops-periodics-upgrades.yaml#L17-L22

Maybe we could update build_jobs.py to clone the release branch for upgrade tests that upgrade to non-latest kops versions?

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 8, 2023
@johngmyers
Copy link
Member Author

/test pull-kops-e2e-cni-cilium
/test pull-kops-e2e-cni-cilium-ipv6
/test pull-kops-e2e-cni-cilium-etcd
/test pull-kops-e2e-cni-cilium-eni

@hakman
Copy link
Member

hakman commented Aug 8, 2023

K8s 1.28 will be released a week from now. I think what @rifelpet was doing with checking K8s version instead of kOps version was pretty good. We already do checks against k8sVersion.Minor.

if err != nil {
return err
}
isPre28 := kopsVersion < "1.28"
Copy link
Member

Choose a reason for hiding this comment

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

nit: This will evaluate to false for any future 1.28 pre-release builds

Copy link
Member

Choose a reason for hiding this comment

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

And we can't inspect the Cluster manifest because spec.networking.cilium.version isn't guaranteed to be set. I suppose one alternative would be to inspect the daemonset itself with the kubectl binary that the tester downloads:

func KubectlPath() string {
return artifacts.RunDir() + "/kubectl"
}

Copy link
Member Author

Choose a reason for hiding this comment

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

Evaluating false for future 1.28 pre release builds is desired behavior

@johngmyers
Copy link
Member Author

Checking k8s version has the undesirable behavior of skipping those tests on kops 1.28+ branch kops and <1.28 k8s

@hakman
Copy link
Member

hakman commented Aug 8, 2023

Checking k8s version has the undesirable behavior of skipping those tests on kops 1.28+ branch kops and <1.28 k8s

In my opinion, that is irrelevant. We aim for most maintainable code here, not for exact skip list.

@johngmyers johngmyers changed the title WIP Trim e2e skip regexes for Cilium Trim e2e skip regexes for Cilium Aug 8, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 8, 2023
@johngmyers
Copy link
Member Author

Being able to remove the extra skips earlier leads to more maintainable code.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 12, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 12, 2023
@k8s-ci-robot k8s-ci-robot merged commit eeaad02 into kubernetes:master Aug 12, 2023
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Aug 12, 2023
@johngmyers johngmyers deleted the reduce-skip branch August 12, 2023 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/office-hours lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reduce the list of skipped e2e test for Cilium
4 participants