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.

Sign up for GitHub

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

Jump to bottom

🌱 test/e2e: Cleanup test files & update doc #7825

Merged
merged 1 commit into from
Jan 11, 2023
Merged

🌱 test/e2e: Cleanup test files & update doc #7825

merged 1 commit into from
Jan 11, 2023

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jan 2, 2023 •
edited
Loading

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
I know the diff looks a bit scary but mostly just moved or deleted files.

Changes:

  • data/infrastructure and data/shared are now organized consistently by version (not partially by contract)
  • Dropped v1.2 => main test as we are not supporting (and thus not testing) skip-level upgrades. Should also speed up our test jobs.
  • Updated documentation accordingly

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #7699
Follow-up to #7692 (comment)

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 2, 2023
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 2, 2023
sbueringer
sbueringer commented Jan 2, 2023
View reviewed changes
.gitignore Show resolved Hide resolved
@sbueringer
Copy link
Member Author

/test ?

@k8s-ci-robot

This comment was marked as outdated.

Sign in to view
@sbueringer sbueringer force-pushed the pr-cleanup-testfiles branch from 5b40fd7 to df04f9c Compare January 2, 2023 18:55
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-25-latest-main

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 3, 2023
@sbueringer sbueringer force-pushed the pr-cleanup-testfiles branch from df04f9c to 3dfa5a2 Compare January 3, 2023 06:40
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 3, 2023
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-25-latest-main

@sbueringer sbueringer force-pushed the pr-cleanup-testfiles branch 3 times, most recently from c2d5eb8 to 981a236 Compare January 3, 2023 12:32
@sbueringer sbueringer changed the title [WIP] 🌱 test/e2e: Cleanup test files & update doc 🌱 test/e2e: Cleanup test files & update doc Jan 3, 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 Jan 3, 2023
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-25-latest-main

@sbueringer
Copy link
Member Author

/retest

@sbueringer
Copy link
Member Author

/assign @fabriziopandini @killianmuldoon @ykakarap

Please see changes documented in the PR description

@sbueringer
Copy link
Member Author

/retest

fabriziopandini
fabriziopandini reviewed Jan 4, 2023
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

I really like the new organizations it is cleaner and simpler to maintain. Great job

docs/release/release-tasks.md Outdated Show resolved Hide resolved
test/e2e/clusterctl_upgrade_test.go Show resolved Hide resolved
test/e2e/data/infrastructure-docker/README.md Outdated Show resolved Hide resolved
@sbueringer sbueringer force-pushed the pr-cleanup-testfiles branch from 981a236 to f316780 Compare January 5, 2023 07:16
fabriziopandini
fabriziopandini reviewed Jan 5, 2023
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 5, 2023
@sbueringer sbueringer force-pushed the pr-cleanup-testfiles branch from 8f05d39 to 38a119f Compare January 5, 2023 15:53
@sbueringer
Copy link
Member Author

Squashed

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-25-latest-main

@fabriziopandini
Copy link
Member

/test pull-cluster-api-e2e-full-main

@sbueringer sbueringer force-pushed the pr-cleanup-testfiles branch from 0f2d5dd to c586730 Compare January 6, 2023 08:05
@sbueringer
Copy link
Member Author

(Just pushed a small fix as I broke the spacing in the clusterctl init log with strings.Join)

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-25-latest-main

@sbueringer
Copy link
Member Author

/retest

(flake)

@fabriziopandini
Copy link
Member

/hold
for after the patch release

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 9, 2023
@sbueringer sbueringer force-pushed the pr-cleanup-testfiles branch from c586730 to ca718af Compare January 11, 2023 11:29
@sbueringer sbueringer mentioned this pull request Jan 11, 2023
Merged
@fabriziopandini
Copy link
Member

/lgtm
/approve

@sbueringer feel free to leave the hold when you think we can merge this according to the other work going on on tests/test flakes

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

LGTM label has been added.

Git tree hash: b3be0ba4a7170f664b0cc5e10d7b7562d89b1613

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 Jan 11, 2023
@sbueringer
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2023
@k8s-ci-robot k8s-ci-robot merged commit 246a986 into kubernetes-sigs:main Jan 11, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Jan 11, 2023
@sbueringer
Copy link
Member Author

/cherry-pick release-1.2

@sbueringer
Copy link
Member Author

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #7825 failed to apply on top of branch "release-1.2":

Applying: test/e2e: Cleanup test files & update doc
error: mode change for test/e2e/data/infrastructure-docker/v1beta1/main/bases/cluster-with-kcp.yaml, which is not in current HEAD
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test/e2e: Cleanup test files & update doc
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #7825 failed to apply on top of branch "release-1.3":

Applying: test/e2e: Cleanup test files & update doc
error: mode change for test/e2e/data/infrastructure-docker/v1beta1/v1.3/bases/crs.yaml, which is not in current HEAD
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test/e2e: Cleanup test files & update doc
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sbueringer sbueringer deleted the pr-cleanup-testfiles branch January 11, 2023 15:39
@sbueringer sbueringer mentioned this pull request Jan 11, 2023
Merged
@sbueringer
Copy link
Member Author

Will open the release-1.2 cherry-pick soon as well

@sbueringer sbueringer mentioned this pull request Jan 11, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CecileRobertMichon CecileRobertMichon Awaiting requested review from CecileRobertMichon

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

@ykakarap ykakarap Awaiting requested review from ykakarap

@killianmuldoon killianmuldoon Awaiting requested review from killianmuldoon

Assignees

@fabriziopandini fabriziopandini

@ykakarap ykakarap

@killianmuldoon killianmuldoon

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

update test/e2e/data/infrastructure-docker/README.md with more details on test files setup
6 participants
@sbueringer @k8s-ci-robot @fabriziopandini @k8s-infra-cherrypick-robot @killianmuldoon @ykakarap