Skip to content

OCPBUGS-1912: Move opm diff to oc mirror #391

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

grokspawn
Copy link
Contributor

No description provided.

@openshift-ci openshift-ci bot requested review from awgreene and hasbro17 September 22, 2022 16:41
@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 22, 2022
@grokspawn
Copy link
Contributor Author

/retest-required

1 similar comment
@grokspawn
Copy link
Contributor Author

/retest-required

@grokspawn
Copy link
Contributor Author

/retest-required
/jira refresh

@grokspawn
Copy link
Contributor Author

/retest-required

1 similar comment
@grokspawn
Copy link
Contributor Author

/retest-required

Copy link
Contributor

@timflannagan timflannagan left a comment

Choose a reason for hiding this comment

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

It looks like we're introducing a staging/*/vendor file in one of the cherry picked commits:

$ git show HEAD~1 --stat staging/operator-registry/ | grep vendor
 staging/operator-registry/vendor/modules.txt       | 1313 ++++++++

Which is causing the registry unit test failures. Manually removing this nested vendor directory produces a local diff, and re-running the make unit/registry resulted in a successful run.

/lgtm cancel

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 27, 2022
@grokspawn grokspawn force-pushed the move-opm-diff-to-oc-mirror branch from 77326b3 to 536eebc Compare September 27, 2022 17:49
pawicao-ibm and others added 2 commits September 27, 2022 13:21
* Removed diff logic (migration to oc-mirror)
* updated vendor for removed diff logic

Signed-off-by: Oskar Pawica <[email protected]>
Upstream-commit: d166a495355900e3d28735380f6365dfa9d10a4f
Upstream-repository: operator-registry
…roperty to a channel (openshift#969)

* Added the channel Priority feature
* Added comments for the internal usage of Channel properties

Signed-off-by: Oskar Pawica <[email protected]>

Signed-off-by: Oskar Pawica <[email protected]>
Co-authored-by: Oskar Pawica <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 208775f5a9bf02804646751ef9c7cf48d7902e9b
@grokspawn grokspawn force-pushed the move-opm-diff-to-oc-mirror branch from 536eebc to 65c171c Compare September 27, 2022 18:23
@grokspawn
Copy link
Contributor Author

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2022

@grokspawn: 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-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 28, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn, timflannagan

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

@grokspawn
Copy link
Contributor Author

/jira refresh

@grokspawn grokspawn changed the title OLM-2785: Move opm diff to oc mirror OCPBUGS-1912: Move opm diff to oc mirror Sep 30, 2022
@openshift-ci-robot openshift-ci-robot added jira/severity-informational Referenced Jira bug's severity is informational for the PR. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 30, 2022
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-1912, which is invalid:

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

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.

@grokspawn
Copy link
Contributor Author

/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 Sep 30, 2022
@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 Sep 30, 2022
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-1912, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.0) matches configured target version for branch (4.12.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

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 openshift-ci bot requested a review from Xia-Zhao-rh September 30, 2022 13:07
@openshift-merge-robot openshift-merge-robot merged commit 92b7250 into openshift:master Sep 30, 2022
@openshift-ci-robot
Copy link

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

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

In response to this:

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.

@grokspawn grokspawn deleted the move-opm-diff-to-oc-mirror branch September 30, 2022 13:10
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Jan 15, 2025
- Updated `github.com/kisielk/errcheck` from `v1.5.0` to `v1.8.0`
- Updated `golang.org/x/lint` from `v0.0.0-20200302205851-738671d3881b` to `v0.0.0-20241112194109-818c5a804067`
- Updated `golang.org/x/mod` from `v0.21.0` to `v0.22.0`
- Updated `golang.org/x/tools` from `v0.26.0` to `v0.29.0`

Added new dependencies:
- `go.opentelemetry.io/otel/trace v1.28.0`
- `go.opentelemetry.io/proto/otlp v1.3.1`
- `golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56`

Removed older dependencies:
- `github.com/kisielk/errcheck v1.5.0`
- `golang.org/x/lint v0.0.0-20200302205851-738671d3881b`

Upstream-repository: api
Upstream-commit: 61b03f0d8b727c3d4d412fbb931bb526eb665df4
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/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/severity-informational Referenced Jira bug's severity is informational for the PR. 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