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

🌱 Refactor test data to allow multiple versions #2250

Merged
merged 1 commit into from
Aug 18, 2023
Merged

🌱 Refactor test data to allow multiple versions #2250

merged 1 commit into from
Aug 18, 2023

Conversation

killianmuldoon
Copy link
Contributor

@killianmuldoon killianmuldoon commented Aug 17, 2023 •
edited
Loading

This PR restructures the test data folder for e2e tests to make it more friendly to holding multiple versions at a time.

Part of #2251

@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 Aug 17, 2023
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Aug 17, 2023
@killianmuldoon
Copy link
Contributor Author

/test

@k8s-ci-robot
Copy link
Contributor

@killianmuldoon: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-full-main
  • /test pull-cluster-api-provider-vsphere-e2e-main
  • /test pull-cluster-api-provider-vsphere-test-integration-main
  • /test pull-cluster-api-provider-vsphere-test-main
  • /test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e-main
  • pull-cluster-api-provider-vsphere-test-integration-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test

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.

@killianmuldoon
Copy link
Contributor Author

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

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 17, 2023
@killianmuldoon
Copy link
Contributor Author

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

@killianmuldoon
Copy link
Contributor Author

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

killianmuldoon
killianmuldoon commented Aug 17, 2023
View reviewed changes
.gitignore Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 17, 2023
@killianmuldoon
Copy link
Contributor Author

Only one failure in the full-e2e run which I think must have been a flake so this is looking ready for review IMO.

@killianmuldoon
Copy link
Contributor Author

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

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 17, 2023
@killianmuldoon killianmuldoon changed the title [WIP] 🌱 Refactor test data to allow multiple versions 🌱 Refactor test data to allow multiple versions Aug 17, 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 17, 2023
@killianmuldoon
Copy link
Contributor Author

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

chrischdi
chrischdi reviewed Aug 18, 2023
View reviewed changes
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

Just nits

/lgtm

docs/release/release-tasks.md Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 18, 2023
sbueringer
sbueringer reviewed Aug 18, 2023
View reviewed changes
docs/release/release-tasks.md Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@killianmuldoon
Copy link
Contributor Author

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

sbueringer
sbueringer reviewed Aug 18, 2023
View reviewed changes
Makefile Outdated
@@ -595,8 +597,12 @@ release-manifests: $(BUILD_DIR) $(MANIFEST_DIR) $(KUSTOMIZE) $(STAGE)-flavors ##
cp metadata.yaml $(MANIFEST_DIR)/metadata.yaml

.PHONY: release-flavors ## Create release flavor manifests
release-flavors: $(RELEASE_DIR)
$(MAKE) generate-flavors FLAVOR_DIR=$(RELEASE_DIR)
release-flavors: $(KUSTOMIZE) $(addprefix release-flavors-, main)
Copy link
Member

@sbueringer sbueringer Aug 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I think this breaks our release GitHub action

release-manifests-all > release-manifests > release-flavors and then the action picks up stuff from the out folder

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're dead right - added a specific target for generating the flavors here, but still to the out directory.

I'm wondering if we need to keep or if we actually use dev-flavors which copies a manifest to the overrides folder in the clusterctl repo, but I think we can come back to cleaning up the dev workflow once we're all more experienced with it.

Copy link
Member

Choose a reason for hiding this comment

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

Yup. I think I would stay away from dev-flavors and that overrides dir :D

Copy link
Member

Choose a reason for hiding this comment

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

Maybe let's preserve whatever that dev workflow is (that we're not really using because of tilt) and have our own thing for e2e

@sbueringer
Copy link
Member

/lgtm
/approve

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

/hold
Might be good to wait for final confirmation on e2e-full

@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 Aug 18, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 18, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1d63fb7c538d93f6809ef407e249f6c2af4a0a91

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 18, 2023
@sbueringer
Copy link
Member

Up to you how you want to cherry-pick this stuff. (every PR or once we have the final version on main working)

@killianmuldoon
Copy link
Contributor Author

Seems like a flake

/retest

@killianmuldoon
Copy link
Contributor Author

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot
Copy link

@killianmuldoon: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

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
Copy link
Member

I think the versions are off for release-1.8 even if the cherry-pick goes through

@killianmuldoon
Copy link
Contributor 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 Aug 18, 2023
@killianmuldoon
Copy link
Contributor Author

e2e now passing - I'll do the cherry picks manually

@killianmuldoon
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 5661ea2 into kubernetes-sigs:main Aug 18, 2023
13 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Aug 18, 2023
@k8s-infra-cherrypick-robot
Copy link

@killianmuldoon: #2250 failed to apply on top of branch "release-1.8":

Applying: Refactor test data to align with core CAPI
.git/rebase-apply/patch:2450: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	Makefile
M	docs/release/release-tasks.md
M	test/e2e/config/vsphere-ci.yaml
M	test/e2e/config/vsphere-dev.yaml
Falling back to patching base and 3-way merge...
Removing test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha4/cluster-template.yaml
Removing test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha3/cluster-template.yaml
Removing test/e2e/data/cni/kindnet/kindnet.yaml
Auto-merging test/e2e/config/vsphere-dev.yaml
Auto-merging test/e2e/config/vsphere-ci.yaml
Removing test/e2e/capi_clusterctl_upgrade_test.go
Auto-merging docs/release/release-tasks.md
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Refactor test data to align with core CAPI
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.8

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.

This was referenced Aug 21, 2023
Merged
Merged
Merged
Merged
@cxbrowne1207 cxbrowne1207 mentioned this pull request Nov 28, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@gab-satchi gab-satchi Awaiting requested review from gab-satchi

@MaxRink MaxRink Awaiting requested review from MaxRink

@chrischdi chrischdi Awaiting requested review from chrischdi

Assignees

@chrischdi chrischdi

@sbueringer sbueringer

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.
5 participants
@killianmuldoon @k8s-ci-robot @sbueringer @k8s-infra-cherrypick-robot @chrischdi