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

SPLAT-1440: prevent rollout due to irrelevant path artifacts #275

Merged
merged 8 commits into from Mar 11, 2024

Conversation

rvanderp3
Copy link
Contributor

@rvanderp3 rvanderp3 commented Feb 6, 2024

changes:

  • prevent the control plane machineset from rolling out if irrelevant path artifacts are in the resource pool path
  • fixed the casing of the resource pool path
  • increased unit test coverage
  • bumped the API(and cpms CRD) to api#1759

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 6, 2024

@rvanderp3: This pull request references SPLAT-1440 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 6, 2024
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 6, 2024
@rvanderp3
Copy link
Contributor Author

/test unit

Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 6, 2024
@rvanderp3 rvanderp3 changed the title WIP: SPLAT-1440: improve unit tests WIP: SPLAT-1440: improve vSphere unit tests Feb 6, 2024
Copy link
Contributor

openshift-ci bot commented Feb 8, 2024

@rvanderp3: This PR was included in a payload test run from openshift/api#1759
trigger 68 job(s) of type informing for the nightly release of OCP 4.16

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-agent-compact-ipv4-conformance
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-agent-ha-dualstack-conformance
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-agent-sno-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-console-aws
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.16-periodics-e2e-aws
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-csi
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-fips
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-single-node-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-upgrade-rollback-oldest-supported
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn-cgroupsv2
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-sdn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-upi
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.16-periodics-e2e-azure
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-azure-csi
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-azure-sdn
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-sdn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-cnv-nightly-4.16-e2e-azure-deploy-cnv
  • periodic-ci-openshift-release-master-cnv-nightly-4.16-e2e-azure-upgrade-cnv
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-driver-toolkit
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.16-periodics-e2e-gcp
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-ovn-rt
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-sdn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-sdn-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-serial-virtualmedia-bond
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-upgrade-from-stable-4.15-e2e-metal-ipi-sdn-bm-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-serial-ipv4
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-serial-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-serial-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-upgrade-from-stable-4.15-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ovn-assisted
  • periodic-ci-openshift-osde2e-main-nightly-4.16-osd-aws
  • periodic-ci-openshift-osde2e-main-nightly-4.16-osd-gcp
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-proxy
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ovn-single-node-live-iso
  • periodic-ci-openshift-osde2e-main-nightly-4.16-rosa-classic-sts
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-telco5g
  • periodic-ci-openshift-release-master-nightly-4.16-upgrade-from-stable-4.15-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-upi
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-upi-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-sdn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-static-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7ef73120-c695-11ee-97df-fe0ba4c7dde6-0

Copy link
Contributor

openshift-ci bot commented Feb 8, 2024

@rvanderp3: This PR was included in a payload test run from openshift/api#1759
trigger 68 job(s) of type informing for the nightly release of OCP 4.16

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-agent-compact-ipv4-conformance
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-agent-ha-dualstack-conformance
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-agent-sno-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-console-aws
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.16-periodics-e2e-aws
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-csi
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-fips
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-single-node-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-upgrade-rollback-oldest-supported
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn-cgroupsv2
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-sdn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-upi
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.16-periodics-e2e-azure
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-azure-csi
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-azure-sdn
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-sdn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-cnv-nightly-4.16-e2e-azure-deploy-cnv
  • periodic-ci-openshift-release-master-cnv-nightly-4.16-e2e-azure-upgrade-cnv
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-driver-toolkit
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.16-periodics-e2e-gcp
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-ovn-rt
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-sdn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-sdn-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-gcp-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-serial-virtualmedia-bond
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-upgrade-from-stable-4.15-e2e-metal-ipi-sdn-bm-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-serial-ipv4
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-serial-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-serial-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-upgrade-from-stable-4.15-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ovn-assisted
  • periodic-ci-openshift-osde2e-main-nightly-4.16-osd-aws
  • periodic-ci-openshift-osde2e-main-nightly-4.16-osd-gcp
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-proxy
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ovn-single-node-live-iso
  • periodic-ci-openshift-osde2e-main-nightly-4.16-rosa-classic-sts
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-telco5g
  • periodic-ci-openshift-release-master-nightly-4.16-upgrade-from-stable-4.15-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-upi
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-ovn-upi-serial
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-sdn
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-vsphere-static-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/163edea0-c6c5-11ee-9a19-8791530867b9-0

@rvanderp3 rvanderp3 changed the title WIP: SPLAT-1440: improve vSphere unit tests SPLAT-1440: prevent rollout due to irrelevant path artifacts Feb 12, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 12, 2024

@rvanderp3: This pull request references SPLAT-1440 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

changes:

  • prevent the control plane machineset from rolling out if irrelevant path artifacts are in the resource pool path
  • fixed the casing of the resource pool path
  • increased unit test coverage

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 openshift-eng/jira-lifecycle-plugin repository.

@rvanderp3 rvanderp3 marked this pull request as ready for review February 12, 2024 14:18
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 12, 2024
@rvanderp3
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 12, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 12, 2024

@rvanderp3: This pull request references SPLAT-1440 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

changes:

  • prevent the control plane machineset from rolling out if irrelevant path artifacts are in the resource pool path
  • fixed the casing of the resource pool path
  • increased unit test coverage
  • bumped the API(and cpms CRD) to api#1759

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 12, 2024
@rvanderp3
Copy link
Contributor Author

/retest-required

1 similar comment
@rvanderp3
Copy link
Contributor Author

/retest-required

@rvanderp3
Copy link
Contributor Author

/test unit

1 similar comment
@rvanderp3
Copy link
Contributor Author

/test unit

@rvanderp3
Copy link
Contributor Author

/test e2e-vsphere-operator

@rvanderp3 rvanderp3 force-pushed the SPLAT-1440 branch 2 times, most recently from e4df248 to 653e795 Compare February 19, 2024 21:54
Comment on lines 50 to 51
func setInfrastructure(infra configv1.Infrastructure) error {

return nil
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we can drop this as well

Copy link
Contributor

Choose a reason for hiding this comment

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

removed.

@vr4manta
Copy link
Contributor

vr4manta commented Mar 4, 2024

/test unit

@rvanderp3
Copy link
Contributor Author

/assign @jcpowermac

@jcpowermac
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2024
@rvanderp3
Copy link
Contributor Author

/assign @JoelSpeed

@rvanderp3
Copy link
Contributor Author

/assign @damdo

)))
})

It("when providing failure domains in vSphere configuration", func() {
Copy link
Member

Choose a reason for hiding this comment

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

Gotcha, maybe we could add this description you provided as a comment on top of the It 👍


for i := 0; i < 3; i++ {
controlPlaneMachine := controlPlaneMachineBuilder.Build()
Expect(k8sClient.Create(ctx, controlPlaneMachine)).To(Succeed(), "expected to be able to create the control plane machinset")
Copy link
Member

Choose a reason for hiding this comment

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

It looks like we have a typo machinset here and in other 12 occurrences

Copy link
Member

Choose a reason for hiding this comment

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

The preferred spelling is control plane machine set, as per docs guidelines

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2024
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Thanks for your work @rvanderp3
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2024
@damdo
Copy link
Member

damdo commented Mar 11, 2024

@JoelSpeed said he's happy with this.

CI failures:

  • most/all GCP CI jobs have issue due to unknown bug
  • aws, vsphere etcd-scaling issues look unrelated
  • azure and openstack have issues installing, but passed in previous runs

Plus all these are optional ☝️

Based on this
/approve

Copy link
Contributor

openshift-ci bot commented Mar 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 11, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ba09023 and 2 for PR HEAD a58712e in total

Copy link
Contributor

openshift-ci bot commented Mar 11, 2024

@rvanderp3: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-operator a58712e link false /test e2e-gcp-operator
ci/prow/e2e-gcp-ovn-etcd-scaling a58712e link false /test e2e-gcp-ovn-etcd-scaling
ci/prow/e2e-vsphere-ovn-etcd-scaling a58712e link false /test e2e-vsphere-ovn-etcd-scaling
ci/prow/e2e-openstack-operator-zone a58712e link false /test e2e-openstack-operator-zone
ci/prow/e2e-azure-operator a58712e link false /test e2e-azure-operator

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit baeb063 into openshift:main Mar 11, 2024
19 of 24 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-control-plane-machine-set-operator-container-v4.16.0-202403111814.p0.gbaeb063.assembly.stream.el9 for distgit ose-cluster-control-plane-machine-set-operator.
All builds following this will include this PR.

@sgaoshang
Copy link

Will it back port to 4.15? IIRC https://issues.redhat.com/browse/OCPBUGS-29236 need to get verified after it back port to 4.15.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants