OCPBUGS-24716: Revert "STOR-1396: Rebase to v3.1.1 for OCP 4.15" by gnufied · Pull Request #101 · openshift/vmware-vsphere-csi-driver

gnufied · 2023-12-07T18:21:52Z

Reverts #97

I didn't do anything fancy to revert these changes. I simply pressed the revert button on Github which typically is displayed on a merged PR.

Just for comparison - I also did a manual revert on CLI using following command:

git revert -m1 <merge_sha>

And contents were identical to one produced in this PR.

openshift-ci-robot · 2023-12-07T18:21:56Z

@gnufied: This pull request references STOR-1396 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 story to target the "4.15.0" version, but no target version was set.

Details

In response to this:

Reverts #97

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.

openshift-ci · 2023-12-07T18:24:26Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [gnufied]

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

openshift-ci-robot · 2023-12-07T18:29:17Z

@gnufied: This pull request references STOR-1396 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 story to target the "4.15.0" version, but no target version was set.

Details

In response to this:

Reverts #97

I didn't do anything fancy to revert these changes. I simply pressed the revert button on Github which typically is displayed on a merged PR.

Just for comparison - I also did a manual revert on CLI using following command:
git revert -m1 <merge_sha>
And contents were identical to one produced in this PR.

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.

bertinatto

/lgtm

Phaow · 2023-12-08T00:32:45Z

/retest

gnufied · 2023-12-08T18:53:10Z

/override verify-commits

gnufied · 2023-12-08T18:53:17Z

/retest

openshift-ci · 2023-12-08T18:53:38Z

@gnufied: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

verify-commits

Only the following failed contexts/checkruns were expected:

ci/prow/e2e-vsphere
ci/prow/e2e-vsphere-csi
ci/prow/e2e-vsphere-csi-extended
ci/prow/e2e-vsphere-ovn-upgrade
ci/prow/e2e-vsphere-zones
ci/prow/images
ci/prow/unit
ci/prow/verify-commits
ci/prow/verify-deps
pull-ci-openshift-vmware-vsphere-csi-driver-master-e2e-vsphere
pull-ci-openshift-vmware-vsphere-csi-driver-master-e2e-vsphere-csi
pull-ci-openshift-vmware-vsphere-csi-driver-master-e2e-vsphere-csi-extended
pull-ci-openshift-vmware-vsphere-csi-driver-master-e2e-vsphere-ovn-upgrade
pull-ci-openshift-vmware-vsphere-csi-driver-master-e2e-vsphere-zones
pull-ci-openshift-vmware-vsphere-csi-driver-master-images
pull-ci-openshift-vmware-vsphere-csi-driver-master-unit
pull-ci-openshift-vmware-vsphere-csi-driver-master-verify-commits
pull-ci-openshift-vmware-vsphere-csi-driver-master-verify-deps
tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override verify-commits

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.

gnufied · 2023-12-08T19:15:17Z

/override ci/prow/verify-commits

openshift-ci · 2023-12-08T19:15:39Z

@gnufied: Overrode contexts on behalf of gnufied: ci/prow/verify-commits

Details

In response to this:

/override ci/prow/verify-commits

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.

openshift-ci-robot · 2023-12-11T15:52:50Z

@gnufied: This pull request references Jira Issue OCPBUGS-24716, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.0) matches configured target version for branch (4.16.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Reverts #97

I didn't do anything fancy to revert these changes. I simply pressed the revert button on Github which typically is displayed on a merged PR.

Just for comparison - I also did a manual revert on CLI using following command:
git revert -m1 <merge_sha>
And contents were identical to one produced in this PR.

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.

gnufied · 2023-12-11T15:52:52Z

/jira refresh

openshift-ci-robot · 2023-12-11T15:52:56Z

@gnufied: This pull request references Jira Issue OCPBUGS-24716, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.0) matches configured target version for branch (4.16.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

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.

openshift-ci-robot · 2023-12-11T16:32:10Z

/retest-required

Remaining retests: 0 against base HEAD 56a1741 and 2 for PR HEAD 3bdc7e3 in total

duanwei33 · 2023-12-12T15:22:33Z

/label qe-approved

openshift-ci-robot · 2023-12-12T15:22:43Z

@gnufied: This pull request references Jira Issue OCPBUGS-24716, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.0) matches configured target version for branch (4.16.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

Details

In response to this:

Reverts #97

I didn't do anything fancy to revert these changes. I simply pressed the revert button on Github which typically is displayed on a merged PR.

Just for comparison - I also did a manual revert on CLI using following command:
git revert -m1 <merge_sha>
And contents were identical to one produced in this PR.

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.

gnufied · 2023-12-12T16:13:32Z

/label px-approved
/label docs-approved

gnufied · 2023-12-12T16:13:41Z

/retest

openshift-bot · 2024-01-01T00:00:44Z

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

openshift-ci-robot · 2024-01-01T00:01:19Z

@openshift-bot: This pull request references Jira Issue OCPBUGS-24716, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.0) matches configured target version for branch (4.16.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

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.

jsafrane · 2024-01-03T12:50:10Z

/override ci/prow/e2e-vsphere-ovn-upgrade
because of https://issues.redhat.com/browse/OCPBUGS-25431

jsafrane · 2024-01-03T12:51:39Z

/hold cancel

openshift-ci · 2024-01-03T12:54:33Z

@jsafrane: Overrode contexts on behalf of jsafrane: ci/prow/e2e-vsphere-ovn-upgrade

Details

In response to this:

/override ci/prow/e2e-vsphere-ovn-upgrade
because of https://issues.redhat.com/browse/OCPBUGS-25431

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.

openshift-ci-robot · 2024-01-03T13:14:14Z

/retest-required

Remaining retests: 0 against base HEAD a4389e1 and 2 for PR HEAD 3bdc7e3 in total

openshift-ci-robot · 2024-01-03T17:11:30Z

/retest-required

Remaining retests: 0 against base HEAD f78b011 and 1 for PR HEAD 3bdc7e3 in total

gnufied · 2024-01-03T18:10:58Z

/override ci/prow/verify-commits
/retest

openshift-ci · 2024-01-03T18:11:21Z

@gnufied: Overrode contexts on behalf of gnufied: ci/prow/verify-commits

Details

In response to this:

/override ci/prow/verify-commits
/retest

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.

openshift-ci-robot · 2024-01-04T14:05:12Z

/retest-required

Remaining retests: 0 against base HEAD 457d0a8 and 0 for PR HEAD 3bdc7e3 in total

….1.1" This reverts commit 15d2569, reversing changes made to ac7f4d3.

dobsonj · 2024-01-04T21:17:43Z

/lgtm
/override ci/prow/verify-commits
/override ci/prow/e2e-vsphere-ovn-upgrade

openshift-ci · 2024-01-04T21:18:16Z

@dobsonj: Overrode contexts on behalf of dobsonj: ci/prow/e2e-vsphere-ovn-upgrade, ci/prow/verify-commits

Details

In response to this:

/lgtm
/override ci/prow/verify-commits
/override ci/prow/e2e-vsphere-ovn-upgrade

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.

openshift-ci · 2024-01-04T21:18:19Z

@gnufied: The following test 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-vsphere-csi-extended	`6fb8e63`	link	false	`/test e2e-vsphere-csi-extended`

Full PR test history. Your PR dashboard.

Details

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-ci-robot · 2024-01-04T21:20:36Z

@gnufied: Jira Issue OCPBUGS-24716: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-24716 has been moved to the MODIFIED state.

Details

In response to this:

Reverts #97

I didn't do anything fancy to revert these changes. I simply pressed the revert button on Github which typically is displayed on a merged PR.

Just for comparison - I also did a manual revert on CLI using following command:
git revert -m1 <merge_sha>
And contents were identical to one produced in this PR.

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-bot · 2024-01-04T22:40:31Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-vmware-vsphere-csi-driver-container-v4.16.0-202401042211.p0.gdb2a187.assembly.stream for distgit ose-vmware-vsphere-csi-driver.
All builds following this will include this PR.

openshift-bot · 2024-01-04T22:40:32Z

[ART PR BUILD NOTIFIER]

This PR has been included in build vmware-vsphere-syncer-container-v4.16.0-202401042211.p0.gdb2a187.assembly.stream for distgit vmware-vsphere-syncer.
All builds following this will include this PR.

gnufied · 2024-01-05T13:36:15Z

/cherry-pick release-4.15

openshift-cherrypick-robot · 2024-01-05T13:37:04Z

@gnufied: #101 failed to apply on top of branch "release-4.15":

Applying: Revert "Merge pull request #97 from jsafrane/rebase-v3.1.1"
Applying: UPSTREAM: <carry> update vendor
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/vmware/govmomi/simulator/container.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/golang.org/x/text/width/width.go
Removing vendor/golang.org/x/text/width/trieval.go
Removing vendor/golang.org/x/text/width/transform.go
Removing vendor/golang.org/x/text/width/tables9.0.0.go
Removing vendor/golang.org/x/text/width/tables15.0.0.go
Removing vendor/golang.org/x/text/width/tables13.0.0.go
Removing vendor/golang.org/x/text/width/tables12.0.0.go
Removing vendor/golang.org/x/text/width/tables11.0.0.go
Removing vendor/golang.org/x/text/width/tables10.0.0.go
Removing vendor/golang.org/x/text/width/kind_string.go
Auto-merging vendor/github.com/vmware/govmomi/simulator/container.go
Removing vendor/github.com/go-openapi/swag/.travis.yml
Removing vendor/github.com/PuerkitoBio/urlesc/urlesc.go
Removing vendor/github.com/PuerkitoBio/urlesc/README.md
Removing vendor/github.com/PuerkitoBio/urlesc/LICENSE
Removing vendor/github.com/PuerkitoBio/urlesc/.travis.yml
Removing vendor/github.com/PuerkitoBio/purell/purell.go
Removing vendor/github.com/PuerkitoBio/purell/README.md
Removing vendor/github.com/PuerkitoBio/purell/LICENSE
Removing vendor/github.com/PuerkitoBio/purell/.travis.yml
Removing vendor/github.com/PuerkitoBio/purell/.gitignore
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 UPSTREAM: <carry> update vendor
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".

Details

In response to this:

/cherry-pick release-4.15

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.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 7, 2023

openshift-ci bot requested review from bertinatto and tsmetana December 7, 2023 18:24

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2023

bertinatto reviewed Dec 7, 2023

View reviewed changes

openshift-ci bot assigned bertinatto Dec 7, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2023

gnufied changed the title ~~Revert "STOR-1396: Rebase to v3.1.1 for OCP 4.15"~~ OCPBUGS-24716: Revert "STOR-1396: Rebase to v3.1.1 for OCP 4.15" Dec 11, 2023

openshift-ci-robot added the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Dec 11, 2023

openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Dec 11, 2023

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Dec 12, 2023

openshift-ci bot added px-approved Signifies that Product Support has signed off on this PR docs-approved Signifies that Docs has signed off on this PR labels Dec 12, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 3, 2024

openshift-ci-robot mentioned this pull request Jan 3, 2024

OCPBUGS-24716: Enable new features to prevent CSI driver from crash looping (revert OCPBUGS-23970) openshift/vmware-vsphere-csi-driver-operator#195

Merged

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 4, 2024

gnufied added 2 commits January 4, 2024 10:52

Revert "Merge pull request kubernetes-sigs#97 from jsafrane/rebase-v3…

18f341d

….1.1" This reverts commit 15d2569, reversing changes made to ac7f4d3.

UPSTREAM: <carry> update vendor

6fb8e63

gnufied force-pushed the revert-97-rebase-v3.1.1 branch from 3bdc7e3 to 6fb8e63 Compare January 4, 2024 15:58

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 4, 2024

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2024

openshift-ci bot assigned dobsonj Jan 4, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2024

openshift-merge-bot bot merged commit db2a187 into openshift:master Jan 4, 2024

duanwei33 mentioned this pull request Jun 5, 2024

STOR#1396:Fix vSphere CSI driver version openshift/openshift-docs#76847

Closed

1 task

Conversation

gnufied commented Dec 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 7, 2023 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Dec 7, 2023

Uh oh!

openshift-ci-robot commented Dec 7, 2023 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bertinatto left a comment

Choose a reason for hiding this comment

Uh oh!

Phaow commented Dec 8, 2023

Uh oh!

gnufied commented Dec 8, 2023

Uh oh!

gnufied commented Dec 8, 2023

Uh oh!

openshift-ci bot commented Dec 8, 2023

Uh oh!

gnufied commented Dec 8, 2023

Uh oh!

openshift-ci bot commented Dec 8, 2023

Uh oh!

openshift-ci-robot commented Dec 11, 2023

Uh oh!

gnufied commented Dec 11, 2023

Uh oh!

openshift-ci-robot commented Dec 11, 2023

Uh oh!

openshift-ci-robot commented Dec 11, 2023

Uh oh!

duanwei33 commented Dec 12, 2023

Uh oh!

openshift-ci-robot commented Dec 12, 2023

Uh oh!

gnufied commented Dec 12, 2023

Uh oh!

gnufied commented Dec 12, 2023

Uh oh!

openshift-bot commented Jan 1, 2024

Uh oh!

openshift-ci-robot commented Jan 1, 2024

Uh oh!

jsafrane commented Jan 3, 2024

Uh oh!

jsafrane commented Jan 3, 2024

Uh oh!

openshift-ci bot commented Jan 3, 2024

Uh oh!

openshift-ci-robot commented Jan 3, 2024

Uh oh!

openshift-ci-robot commented Jan 3, 2024

Uh oh!

gnufied commented Jan 3, 2024

Uh oh!

openshift-ci bot commented Jan 3, 2024

Uh oh!

openshift-ci-robot commented Jan 4, 2024

Uh oh!

dobsonj commented Jan 4, 2024

Uh oh!

openshift-ci bot commented Jan 4, 2024

Uh oh!

openshift-ci bot commented Jan 4, 2024

Uh oh!

openshift-ci-robot commented Jan 4, 2024

Uh oh!

openshift-bot commented Jan 4, 2024

Uh oh!

openshift-bot commented Jan 4, 2024

Uh oh!

gnufied commented Jan 5, 2024

Uh oh!

openshift-cherrypick-robot commented Jan 5, 2024

Uh oh!

Reviewers

gnufied commented Dec 7, 2023 •

edited

Loading

openshift-ci-robot commented Dec 7, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 7, 2023 •

edited by openshift-ci bot

Loading