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

Bug 1862290: vendor/terraform-provider-vsphere: DiskPostCloneOperation patch carry #4060

Merged

Conversation

mtnbikenc
Copy link
Member

Updated openshift fork which contains the patch for DiskPostCloneOperation
openshift/terraform-provider-vsphere#3

Updated openshift fork which contains the patch for
DiskPostCloneOperation
(openshift/terraform-provider-vsphere#3)
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Aug 17, 2020
@openshift-ci-robot
Copy link
Contributor

@mtnbikenc: This pull request references Bugzilla bug 1862290, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1862290: vendor/terraform-provider-vsphere: DiskPostCloneOperation patch carry

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 openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 17, 2020
@abhinavdahiya
Copy link
Contributor

/test e2e-vsphere

@abhinavdahiya
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 17, 2020
@abhinavdahiya
Copy link
Contributor

/test e2e-vsphere

@mtnbikenc
Copy link
Member Author

Install completed in e2e-vsphere:

time="2020-08-17T23:27:50Z" level=info msg="Install complete!"

@abhinavdahiya
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link
Contributor

@mtnbikenc: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-crc ab4e753 link /test e2e-crc
ci/prow/e2e-aws-workers-rhel7 ab4e753 link /test e2e-aws-workers-rhel7
ci/prow/e2e-libvirt ab4e753 link /test e2e-libvirt
ci/prow/e2e-aws-fips ab4e753 link /test e2e-aws-fips
ci/prow/e2e-vsphere ab4e753 link /test e2e-vsphere

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-robot openshift-merge-robot merged commit fcf8f45 into openshift:master Aug 18, 2020
@openshift-ci-robot
Copy link
Contributor

@mtnbikenc: All pull requests linked via external trackers have merged: openshift/installer#4060. Bugzilla bug 1862290 has been moved to the MODIFIED state.

In response to this:

Bug 1862290: vendor/terraform-provider-vsphere: DiskPostCloneOperation patch carry

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.

@mtnbikenc mtnbikenc deleted the vendor-provider-vsphere branch August 18, 2020 19:39
@mtnbikenc
Copy link
Member Author

/cherry-pick release-4.5

@openshift-cherrypick-robot

@mtnbikenc: #4060 failed to apply on top of branch "release-4.5":

Applying: vendor/terraform-provider-vsphere: DiskPostCloneOperation patch carry
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in 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 0001 vendor/terraform-provider-vsphere: DiskPostCloneOperation patch carry
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-4.5

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.

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants