openshift
[release-4.15] OCPBUGS-33548: restrict Masthead logo to max-height
This is an automated cherry-pick of #13838
/assign rhamilto
/cherrypick release-4.14 release-4.13
@openshift-cherrypick-robot: Jira Issue OCPBUGS-33523 has been cloned as Jira Issue OCPBUGS-33548. Will retitle bug to link to clone. /retitle [release-4.15] OCPBUGS-33548: restrict Masthead logo to max-height
In response to this:
This is an automated cherry-pick of #13838
/assign rhamilto
/cherrypick release-4.14 release-4.13
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: This pull request references Jira Issue OCPBUGS-33548, which is invalid:
- release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
- expected dependent Jira Issue OCPBUGS-33523 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead
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:
This is an automated cherry-pick of #13838
/assign rhamilto
/cherrypick release-4.14 release-4.13
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.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: openshift-cherrypick-robot, rhamilto
The full list of commands accepted by this bot can be found here.
The pull request process is described here
- ~~frontend/OWNERS~~ [rhamilto]
Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment
![openshift-ci[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@openshift-cherrypick-robot: all tests passed!
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.
@rhamilto: This pull request references Jira Issue OCPBUGS-33548, which is invalid:
- release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
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.
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.
@rhamilto: This pull request references Jira Issue OCPBUGS-33548, which is valid. The bug has been moved to the POST state.
7 validation(s) were run on this bug
- bug is open, matching expected state (open)
- bug target version (4.15.z) matches configured target version for branch (4.15.z)
- bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
- release note text is set and does not match the template
- dependent bug Jira Issue OCPBUGS-33523 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
- dependent Jira Issue OCPBUGS-33523 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
- bug has dependents
Requesting review from QA contact: /cc @yanpzhan
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.
Checked on the cluster launched against the pr, now a big logo could be restricted in max-height of 60px, the bug is fixed. /label qe-approved /label cherry-pick-approved
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-33548, which is valid.
7 validation(s) were run on this bug
- bug is open, matching expected state (open)
- bug target version (4.15.z) matches configured target version for branch (4.15.z)
- bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
- release note text is set and does not match the template
- dependent bug Jira Issue OCPBUGS-33523 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
- dependent Jira Issue OCPBUGS-33523 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
- bug has dependents
Requesting review from QA contact: /cc @yanpzhan
In response to this:
This is an automated cherry-pick of #13838
/assign rhamilto
/cherrypick release-4.14 release-4.13
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: Jira Issue OCPBUGS-33548: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-33548 has been moved to the MODIFIED state.
In response to this:
This is an automated cherry-pick of #13838
/assign rhamilto
/cherrypick release-4.14 release-4.13
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.
[ART PR BUILD NOTIFIER]
This PR has been included in build openshift-enterprise-console-container-v4.15.0-202405140736.p0.g1707316.assembly.stream.el8 for distgit openshift-enterprise-console. All builds following this will include this PR.
@rhamilto: #13839 failed to apply on top of branch "release-4.14":
Applying: OCPBUGS-33523: restrict Masthead logo to max-height
Using index info to reconstruct a base tree...
A frontend/packages/integration-tests-cypress/tests/app/masthead.cy.ts
M frontend/public/components/masthead.jsx
M frontend/public/style/_overrides.scss
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/style/_overrides.scss
CONFLICT (content): Merge conflict in frontend/public/style/_overrides.scss
Auto-merging frontend/public/components/masthead.jsx
CONFLICT (content): Merge conflict in frontend/public/components/masthead.jsx
CONFLICT (modify/delete): frontend/packages/integration-tests-cypress/tests/app/masthead.cy.ts deleted in HEAD and modified in OCPBUGS-33523: restrict Masthead logo to max-height. Version OCPBUGS-33523: restrict Masthead logo to max-height of frontend/packages/integration-tests-cypress/tests/app/masthead.cy.ts left in tree.
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-33523: restrict Masthead logo to max-height
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.14
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.
Fix included in accepted release 4.15.0-0.nightly-2024-05-14-112809
