Skip to content

OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories #679

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

Merged

Conversation

openshift-bot
Copy link
Contributor

@openshift-bot openshift-bot commented Feb 2, 2024

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)
2024-02-05 19:20:27 operator-framework/operator-lifecycle-manager@6e3f051 Anik Bhattacharjee Reflect BundleUnpacking cond removal in missed e2e test (#3170)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

@openshift-bot openshift-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Feb 2, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 2, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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 a team February 2, 2024 18:35
Copy link
Contributor

openshift-ci bot commented Feb 2, 2024

@openshift-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-ecosystem.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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
Contributor

openshift-ci bot commented Feb 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

1 similar comment
Copy link
Contributor

openshift-ci bot commented Feb 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

@stevekuznetsov
Copy link
Contributor

/retitle OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories Feb 2, 2024
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Feb 2, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request references Jira Issue OCPBUGS-28744, which is invalid:

  • expected the bug to target the "4.16.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:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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.

@stevekuznetsov
Copy link
Contributor

/retitle OCPBUGS-24587,OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-24587,OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories Feb 2, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request references Jira Issue OCPBUGS-24587, which is invalid:

  • expected the bug to target the "4.16.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.

This pull request references Jira Issue OCPBUGS-28744, which is invalid:

  • expected the bug to target the "4.16.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:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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.

@stevekuznetsov
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 2, 2024
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-24587, 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.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

This pull request references Jira Issue OCPBUGS-28744, 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.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

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-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 Feb 2, 2024
@openshift-ci openshift-ci bot requested a review from jianzhangbjz February 2, 2024 19:23
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ebfa3c1 and 2 for PR HEAD a788fc1 in total

Copy link
Contributor

@anik120 anik120 left a comment

Choose a reason for hiding this comment

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

/retitle OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title OCPBUGS-24587,OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories Feb 2, 2024
@anik120
Copy link
Contributor

anik120 commented Feb 2, 2024

/retest

@openshift-bot openshift-bot changed the title OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories NO-ISSUE: Synchronize From Upstream Repositories Feb 3, 2024
@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 3, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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.

@Xia-Zhao-rh
Copy link

Xia-Zhao-rh commented Feb 4, 2024

/label qe-approved
Test PASS https://issues.redhat.com/browse/OCPBUGS-24587

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Feb 4, 2024
@rashmigottipati
Copy link
Member

/test e2e-gcp-olm

@stevekuznetsov
Copy link
Contributor

/retitle OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories Feb 5, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 5, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request references Jira Issue OCPBUGS-24587, which is valid.

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

Requesting review from QA contact:
/cc @Xia-Zhao-rh

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

This pull request references Jira Issue OCPBUGS-28744, which is valid.

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

Requesting review from QA contact:
/cc @jianzhangbjz

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

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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 Xia-Zhao-rh February 5, 2024 14:55
@stevekuznetsov
Copy link
Contributor

/retest

dependabot bot and others added 4 commits February 5, 2024 20:24
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 23.0.3+incompatible to 24.0.7+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v23.0.3...v24.0.7)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1bb6009089171393c94c944257ec7b4d06834551

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* *: don't duplicate owner references

Signed-off-by: Steve Kuznetsov <[email protected]>

* olm,catalog: only validate the resources we label

Each controller can see (and, therefore, can label) a separate set of
GVRs. When we start up, detecting if any OLM-related resource needs
labelling means that one controller may start, detect a need for
labelling a resource it cannot itself label, detect that it's labelled
everything it can, and restart. If the other operator is stuck for
whatever reason, this leads the first controller to enter
CrashLoopBackOff and break OCP upgrade.

Signed-off-by: Steve Kuznetsov <[email protected]>

* catalog: prune duplicate OwnerReferences on Services

Signed-off-by: Steve Kuznetsov <[email protected]>

---------

Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1e0324c128d3095e2f1a66e5c27cfa617eeea876
…3166)

The func `removeSubsCond` takes in a list of pointers to Subscription objects, modifies the
objects that the pointers point to, but return a new list of those pointers. A [PR](operator-framework/operator-lifecycle-manager#2942) included in
the v0.25.0 release [changed the way the output of that function was being used](https://github.com/operator-framework/operator-lifecycle-manager/pull/2942/files#diff-a1760d9b7ac1e93734eea675d8d8938c96a50e995434b163c6f77c91bace9990R1146-R1155) leading to a regression. This PR fixes the `removeSubsCond` function,
fixing the regression as a result.

Closes #3162

Signed-off-by: Anik Bhattacharjee <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 54da66a9996632315827ba37e14823de6405b4d9
PR #3166 removes the `BundleUnpacking` condition once resolution is successful.
PR #3166 [modified an e2e test](operator-framework/operator-lifecycle-manager@54da66a#diff-11f70fc71ac22d725767916f562789de88d06eb9ebe19f337a59fd7035a3ca2dR2448) to reflect that change.
However, the test being fixed in this PR is skipped for upstream, and runs only
downstream.This PR is a follow up to #3166 to reflect the `BundleUnpacking` condition
removal in the remaining test.

Signed-off-by: Anik Bhattacharjee <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6e3f051a4d9ac32222a051029570b88c8ba9e4f6
@openshift-bot openshift-bot changed the title OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories NO-ISSUE: Synchronize From Upstream Repositories Feb 5, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2024
@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 5, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)
2024-02-05 19:20:27 operator-framework/operator-lifecycle-manager@6e3f051 Anik Bhattacharjee Reflect BundleUnpacking cond removal in missed e2e test (#3170)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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.

1 similar comment
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)
2024-02-05 19:20:27 operator-framework/operator-lifecycle-manager@6e3f051 Anik Bhattacharjee Reflect BundleUnpacking cond removal in missed e2e test (#3170)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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.

@stevekuznetsov
Copy link
Contributor

/retitle OCPBUGS-24587,OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-24587,OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories Feb 5, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request references Jira Issue OCPBUGS-24587, which is valid.

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

Requesting review from QA contact:
/cc @Xia-Zhao-rh

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

This pull request references Jira Issue OCPBUGS-28744, which is valid.

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

Requesting review from QA contact:
/cc @jianzhangbjz

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

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)
2024-02-05 19:20:27 operator-framework/operator-lifecycle-manager@6e3f051 Anik Bhattacharjee Reflect BundleUnpacking cond removal in missed e2e test (#3170)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 5, 2024
@stevekuznetsov
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2024
@anik120
Copy link
Contributor

anik120 commented Feb 5, 2024

/retitle OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title OCPBUGS-24587,OCPBUGS-28744: NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-24587,OCPBUGS-28744: Synchronize From Upstream Repositories Feb 5, 2024
Copy link
Contributor

openshift-ci bot commented Feb 5, 2024

@openshift-bot: 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-gcp-olm-flaky 249da52 link false /test e2e-gcp-olm-flaky

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-bot openshift-merge-bot bot merged commit 5748166 into openshift:master Feb 5, 2024
@openshift-ci-robot
Copy link

@openshift-bot: Jira Issue OCPBUGS-24587: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-28744: All pull requests linked via external trackers have merged:

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

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-01-23 15:23:09 operator-framework/operator-lifecycle-manager@1bb6009 dependabot[bot] build(deps): bump github.com/docker/docker (#3080)
2024-02-02 16:05:43 operator-framework/operator-lifecycle-manager@1e0324c Steve Kuznetsov olm,catalog: only validate the resources we label (#3165)
2024-02-02 16:40:15 operator-framework/operator-lifecycle-manager@54da66a Anik Bhattacharjee Clear (existing) error cond from Subscription, once error resolved (#3166)
2024-02-05 19:20:27 operator-framework/operator-lifecycle-manager@6e3f051 Anik Bhattacharjee Reflect BundleUnpacking cond removal in missed e2e test (#3170)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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-bot
Copy link
Contributor Author

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-registry-container-v4.16.0-202402060110.p0.g5748166.assembly.stream for distgit operator-registry.
All builds following this will include this PR.

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/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.

7 participants