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.10] OCPBUGS-1759: Show already loaded catalog items after a timeout (3sec) #12106

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #12070

/assign jerolimov

also when other catalog providers still load their data
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-1523 has been cloned as Jira Issue OCPBUGS-1759. Retitling PR to link against new bug.
/retitle [release-4.10] OCPBUGS-1759: Show already loaded catalog items after a timeout (3sec)

In response to this:

This is an automated cherry-pick of #12070

/assign jerolimov

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.10] OCPBUGS-1523: Show already loaded catalog items after a timeout (3sec) [release-4.10] OCPBUGS-1759: Show already loaded catalog items after a timeout (3sec) Sep 27, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 27, 2022

@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.10] OCPBUGS-1759: Show already loaded catalog items after a timeout (3sec)

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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 27, 2022
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-1759, which is invalid:

  • expected dependent Jira Issue OCPBUGS-1523 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), 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 #12070

/assign jerolimov

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 added component/dev-console Related to dev-console component/helm Related to helm-plugin component/knative Related to knative-plugin component/pipelines Related to pipelines-plugin component/shared Related to console-shared labels Sep 27, 2022
@invincibleJai
Copy link
Member

/retest

@jerolimov
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@jerolimov: This pull request references Jira Issue OCPBUGS-1759, which is invalid:

  • expected dependent Jira Issue OCPBUGS-1523 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ON_QA 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.

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 kubernetes/test-infra repository.

@invincibleJai
Copy link
Member

/cherry-pick release-4.9

@openshift-cherrypick-robot
Copy link
Author

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

In response to this:

/cherry-pick release-4.9

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.

@invincibleJai
Copy link
Member

/lgtm

verified the changes with with a setTimeout in
packages/dev-console/src/components/catalog/providers/useDevfile.tsx and
packages/dev-console/src/components/catalog/providers/useDevfileSamples.tsx

cc @sanketpathak

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

openshift-ci bot commented Oct 3, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: invincibleJai, openshift-cherrypick-robot

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 3, 2022
@invincibleJai
Copy link
Member

/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 Oct 3, 2022
@sanketpathak
Copy link
Contributor

Verified on a cluster using cluster-bot
/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 Oct 3, 2022
@sanketpathak
Copy link
Contributor

/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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Oct 4, 2022
@openshift-ci-robot
Copy link
Contributor

@sanketpathak: This pull request references Jira Issue OCPBUGS-1759, 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.10.z) matches configured target version for branch (4.10.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-1523 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-1523 targets the "4.11.z" version, which is one of the valid target versions: 4.11.0, 4.11.z
  • bug has dependents

Requesting review from QA contact:
/cc @sanketpathak

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 kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 4, 2022
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 82bee42 and 2 for PR HEAD ce93b99 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 4, 2022

@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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 3ab2301 into openshift:release-4.10 Oct 4, 2022
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #12070

/assign jerolimov

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

@invincibleJai: #12106 failed to apply on top of branch "release-4.9":

Applying: Show already loaded items after a timeout (3s)
Using index info to reconstruct a base tree...
A	frontend/packages/console-shared/src/components/catalog/service/CatalogServiceProvider.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/dev-console/src/components/catalog/service/CatalogServiceProvider.tsx
Applying: Improve e2e tests
Using index info to reconstruct a base tree...
M	frontend/packages/dev-console/integration-tests/features/e2e/add-flow-ci.feature
M	frontend/packages/dev-console/integration-tests/support/pageObjects/add-flow-po.ts
M	frontend/packages/dev-console/integration-tests/support/pages/add-flow/catalog-page.ts
M	frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts
M	frontend/packages/knative-plugin/integration-tests/support/step-definitions/serverless/create-knative-workload.ts
M	frontend/packages/pipelines-plugin/integration-tests/support/step-definitions/common/common.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/pipelines-plugin/integration-tests/support/step-definitions/common/common.ts
Auto-merging frontend/packages/knative-plugin/integration-tests/support/step-definitions/serverless/create-knative-workload.ts
Auto-merging frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts
Auto-merging frontend/packages/dev-console/integration-tests/support/pages/add-flow/catalog-page.ts
Auto-merging frontend/packages/dev-console/integration-tests/support/pageObjects/add-flow-po.ts
Auto-merging frontend/packages/dev-console/integration-tests/features/e2e/add-flow-ci.feature
CONFLICT (content): Merge conflict in frontend/packages/dev-console/integration-tests/features/e2e/add-flow-ci.feature
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Improve e2e tests
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.9

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. component/dev-console Related to dev-console component/helm Related to helm-plugin component/knative Related to knative-plugin component/pipelines Related to pipelines-plugin component/shared Related to console-shared 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants