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 1896529: Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release. #7033

Merged

Conversation

jcaianirh
Copy link
Member

@jcaianirh jcaianirh commented Oct 29, 2020

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1896529

Design: https://issues.redhat.com/browse/ODC-5059

Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release.

…rs and update areas that have changed based on the new operator release.
@openshift-ci-robot openshift-ci-robot added the component/core Related to console core functionality label Oct 29, 2020
@beaumorley
Copy link

Thank you @jcaianirh! Sj and I have reviewed. Looks good.

@jcaianirh
Copy link
Member Author

@spadgett this is ready for review/merge

@jcaianirh
Copy link
Member Author

/cherrypick release-4.6

@openshift-cherrypick-robot

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

In response to this:

/cherrypick release-4.6

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.

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@spadgett
Copy link
Member

This will need a Bugzilla bug to be able to cherry-pick back.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaianirh, spadgett

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 Nov 10, 2020
@jcaianirh jcaianirh changed the title ODC 5059: Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release. Bug 1896529: Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release. Nov 10, 2020
@openshift-ci-robot
Copy link
Contributor

@jcaianirh: This pull request references Bugzilla bug 1896529, which is invalid:

  • expected the bug to target the "4.7.0" release, but it targets "---" instead

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

In response to this:

Bug 1896529: Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release.

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 bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Nov 10, 2020
@jcaianirh
Copy link
Member Author

/bugzilla refresh

@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 Nov 10, 2020
@openshift-ci-robot
Copy link
Contributor

@jcaianirh: This pull request references Bugzilla bug 1896529, 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.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla 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 openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Nov 10, 2020
@openshift-merge-robot openshift-merge-robot merged commit 11073d9 into openshift:master Nov 10, 2020
@openshift-ci-robot
Copy link
Contributor

@jcaianirh: All pull requests linked via external trackers have merged:

Bugzilla bug 1896529 has been moved to the MODIFIED state.

In response to this:

Bug 1896529: Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release.

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

@jcaianirh: #7033 failed to apply on top of branch "release-4.6":

Applying: ODC 5059: Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release.
Using index info to reconstruct a base tree...
M	frontend/packages/console-app/src/components/quick-starts/data/explore-serverless-quickstart.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/console-app/src/components/quick-starts/data/explore-serverless-quickstart.ts
CONFLICT (content): Merge conflict in frontend/packages/console-app/src/components/quick-starts/data/explore-serverless-quickstart.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ODC 5059: Updates to the serverless quicks starts content to fix errors and update areas that have changed based on the new operator release.
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:

/cherrypick release-4.6

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-medium Referenced Bugzilla bug's severity is medium 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. component/core Related to console core functionality 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