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

[release-4.13] OCPBUGS-8341: Pass Capabilites from install-config to cluster #6936

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #6923

/assign zaneb

@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-5129 has been cloned as Jira Issue OCPBUGS-8341. Retitling PR to link against new bug.
/retitle [release-4.13] OCPBUGS-8341: Pass Capabilites from install-config to cluster

In response to this:

This is an automated cherry-pick of #6923

/assign zaneb

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 openshift-ci bot changed the title [release-4.13] OCPBUGS-5129: Pass Capabilites from install-config to cluster [release-4.13] OCPBUGS-8341: Pass Capabilites from install-config to cluster Mar 5, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 5, 2023

@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.13] OCPBUGS-8341: Pass Capabilites from install-config to cluster

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 jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Mar 5, 2023
@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 Mar 5, 2023
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-5129 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-5129 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @mhanss

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

In response to this:

This is an automated cherry-pick of #6923

/assign zaneb

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 openshift-ci bot requested a review from mhanss March 5, 2023 22:03
@zaneb
Copy link
Member

zaneb commented Mar 5, 2023

/cherry-pick release-4.12

@openshift-cherrypick-robot
Copy link
Author

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

In response to this:

/cherry-pick release-4.12

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.

@zaneb
Copy link
Member

zaneb commented Mar 5, 2023

/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 5, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zaneb

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 5, 2023
@zaneb
Copy link
Member

zaneb commented Mar 6, 2023

/retest-required

@bfournie
Copy link
Contributor

bfournie commented Mar 6, 2023

/lgtm
/retest-required

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

jhou1 commented Mar 6, 2023

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 6, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 1b6bb66 and 2 for PR HEAD 59f3c6d in total

@zaneb
Copy link
Member

zaneb commented Mar 6, 2023

/test images
/test okd-images
/test okd-scos-unit

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 7, 2023

@openshift-cherrypick-robot: 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-aws-ovn-upgrade 59f3c6d link false /test e2e-aws-ovn-upgrade
ci/prow/e2e-aws-ovn-disruptive 59f3c6d link false /test e2e-aws-ovn-disruptive

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.

@zaneb
Copy link
Member

zaneb commented Mar 7, 2023

/test okd-images
/test okd-scos-unit

@openshift-merge-robot openshift-merge-robot merged commit 9da4b14 into openshift:release-4.13 Mar 7, 2023
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-8341: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #6923

/assign zaneb

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-cherrypick-robot
Copy link
Author

@zaneb: #6936 failed to apply on top of branch "release-4.12":

Applying: OCPBUGS-5129: Pass Capabilites from install-config to cluster
Using index info to reconstruct a base tree...
M	pkg/asset/agent/installconfig.go
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
Auto-merging pkg/asset/agent/installconfig.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-5129: Pass Capabilites from install-config to cluster
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.12

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants