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

OCPBUGS-43972: OCPBUGS-43674: ABI cluster installation fails for external OCI platform #9141

Merged

Conversation

pawanpinjarkar
Copy link
Contributor

  • Correctly maps agentClusterInstall with cloudControllerManager value
  • Updated integrations tests

@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 24, 2024
@openshift-ci-robot
Copy link
Contributor

@pawanpinjarkar: This pull request references Jira Issue OCPBUGS-43674, which is invalid:

  • expected the bug to target the "4.18.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

  • Correctly maps agentClusterInstall with cloudControllerManager value
  • Updated integrations tests

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 requested review from andfasano and rwsu October 24, 2024 18:31
@pawanpinjarkar
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 24, 2024
@openshift-ci-robot
Copy link
Contributor

@pawanpinjarkar: This pull request references Jira Issue OCPBUGS-43674, which is valid. The bug has been moved to the POST state.

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

Requesting review from QA contact:
/cc @mhanss

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

@openshift-ci openshift-ci bot requested a review from mhanss October 24, 2024 18:32
@pawanpinjarkar
Copy link
Contributor Author

/cherrypick release-4.17 release-4.16

@openshift-cherrypick-robot

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

In response to this:

/cherrypick release-4.17 release-4.16

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-sigs/prow repository.

Correctly maps agentClusterInstall with cloudControllerManager value
Updated integrations tests
Copy link
Contributor

openshift-ci bot commented Oct 25, 2024

@pawanpinjarkar: 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-agent-compact-ipv4-appliance-diskimage 6f8c04c link false /test e2e-agent-compact-ipv4-appliance-diskimage

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

@mhanss
Copy link
Contributor

mhanss commented Oct 28, 2024

The bug has been pre-merge tested, and it’s working fine.
/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Oct 28, 2024
@openshift-ci-robot
Copy link
Contributor

@pawanpinjarkar: This pull request references Jira Issue OCPBUGS-43674, which is valid.

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

Requesting review from QA contact:
/cc @mhanss

In response to this:

  • Correctly maps agentClusterInstall with cloudControllerManager value
  • Updated integrations tests

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.

Copy link
Contributor

@rwsu rwsu left a comment

Choose a reason for hiding this comment

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

/lgtm

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

/approve

Copy link
Contributor

openshift-ci bot commented Oct 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pawanpinjarkar

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 Oct 28, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 08792a0 into openshift:master Oct 29, 2024
25 of 26 checks passed
@openshift-ci-robot
Copy link
Contributor

@pawanpinjarkar: Jira Issue OCPBUGS-43674: All pull requests linked via external trackers have merged:

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

In response to this:

  • Correctly maps agentClusterInstall with cloudControllerManager value
  • Updated integrations tests

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-cherrypick-robot

@pawanpinjarkar: #9141 failed to apply on top of branch "release-4.17":

Applying: OCPBUGS-43674: ABI cluster installation fails for external OCI platform Correctly maps agentClusterInstall with cloudControllerManager value Updated integrations tests
Using index info to reconstruct a base tree...
M	pkg/asset/agent/manifests/agentclusterinstall.go
M	pkg/asset/agent/manifests/agentclusterinstall_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/agent/manifests/agentclusterinstall_test.go
CONFLICT (content): Merge conflict in pkg/asset/agent/manifests/agentclusterinstall_test.go
Auto-merging pkg/asset/agent/manifests/agentclusterinstall.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-43674: ABI cluster installation fails for external OCI platform Correctly maps agentClusterInstall with cloudControllerManager value Updated integrations tests

In response to this:

/cherrypick release-4.17 release-4.16

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-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-altinfra
This PR has been included in build ose-installer-altinfra-container-v4.18.0-202410290438.p0.g08792a0.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-terraform-providers
This PR has been included in build ose-installer-terraform-providers-container-v4.18.0-202410290438.p0.g08792a0.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.18.0-202410290438.p0.g08792a0.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.18.0-202410290438.p0.g08792a0.assembly.stream.el9.
All builds following this will include this PR.

@pawanpinjarkar
Copy link
Contributor Author

/cherrypick release-4.17

@openshift-cherrypick-robot

@pawanpinjarkar: #9141 failed to apply on top of branch "release-4.17":

Applying: OCPBUGS-43674: ABI cluster installation fails for external OCI platform Correctly maps agentClusterInstall with cloudControllerManager value Updated integrations tests
Using index info to reconstruct a base tree...
M	pkg/asset/agent/manifests/agentclusterinstall.go
M	pkg/asset/agent/manifests/agentclusterinstall_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/agent/manifests/agentclusterinstall_test.go
CONFLICT (content): Merge conflict in pkg/asset/agent/manifests/agentclusterinstall_test.go
Auto-merging pkg/asset/agent/manifests/agentclusterinstall.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-43674: ABI cluster installation fails for external OCI platform Correctly maps agentClusterInstall with cloudControllerManager value Updated integrations tests

In response to this:

/cherrypick release-4.17

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-sigs/prow repository.

@pawanpinjarkar
Copy link
Contributor Author

@pawanpinjarkar: #9141 failed to apply on top of branch "release-4.17":

Applying: OCPBUGS-43674: ABI cluster installation fails for external OCI platform Correctly maps agentClusterInstall with cloudControllerManager value Updated integrations tests
Using index info to reconstruct a base tree...
M	pkg/asset/agent/manifests/agentclusterinstall.go
M	pkg/asset/agent/manifests/agentclusterinstall_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/agent/manifests/agentclusterinstall_test.go
CONFLICT (content): Merge conflict in pkg/asset/agent/manifests/agentclusterinstall_test.go
Auto-merging pkg/asset/agent/manifests/agentclusterinstall.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-43674: ABI cluster installation fails for external OCI platform Correctly maps agentClusterInstall with cloudControllerManager value Updated integrations tests

Manually cherrypicked via #9152

@pawanpinjarkar
Copy link
Contributor Author

/jira cherry-pick OCPBUGS-43674

@openshift-ci-robot
Copy link
Contributor

@pawanpinjarkar: Jira Issue OCPBUGS-43674 has been cloned as Jira Issue OCPBUGS-43972. Will retitle bug to link to clone.
/retitle OCPBUGS-43972: OCPBUGS-43674: ABI cluster installation fails for external OCI platform

In response to this:

/jira cherry-pick OCPBUGS-43674

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 changed the title OCPBUGS-43674: ABI cluster installation fails for external OCI platform OCPBUGS-43972: OCPBUGS-43674: ABI cluster installation fails for external OCI platform Oct 29, 2024
@openshift-ci-robot
Copy link
Contributor

@pawanpinjarkar: Jira Issue OCPBUGS-43972: All pull requests linked via external trackers have merged:

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

In response to this:

  • Correctly maps agentClusterInstall with cloudControllerManager value
  • Updated integrations tests

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.

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/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants