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.12] OCPBUGS-19405: workload info gatherer, add external image repo #823

Conversation

ncaak
Copy link
Contributor

@ncaak ncaak commented Sep 19, 2023

This is manual cherry-pick of #811

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 19, 2023
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 19, 2023
@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 Sep 19, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 19, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci-robot
Copy link
Contributor

@ncaak: This pull request references Jira Issue OCPBUGS-19405, which is invalid:

  • expected the bug to target the "4.15.0" version, but it targets "4.12.z" 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 manual cherry-pick of #811

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-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2023
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 19, 2023
@ncaak ncaak changed the base branch from master to release-4.12 September 19, 2023 16:56
@openshift-ci-robot
Copy link
Contributor

@ncaak: This pull request references Jira Issue OCPBUGS-19405, which is invalid:

  • expected Jira Issue OCPBUGS-19405 to depend on a bug targeting a version in 4.13.0, 4.13.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

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:

This is manual cherry-pick of #811

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.

@ncaak
Copy link
Contributor Author

ncaak commented Sep 19, 2023

/test lint

@ncaak
Copy link
Contributor Author

ncaak commented Sep 19, 2023

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@ncaak: This pull request references Jira Issue OCPBUGS-19405, which is invalid:

  • expected dependent Jira Issue OCPBUGS-17661 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.

@ncaak
Copy link
Contributor Author

ncaak commented Sep 20, 2023

/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 Sep 20, 2023
@openshift-ci-robot
Copy link
Contributor

@ncaak: This pull request references Jira Issue OCPBUGS-19405, 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.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-17661 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-17661 targets the "4.13.z" version, which is one of the valid target versions: 4.13.0, 4.13.z
  • bug has dependents

Requesting review from QA contact:
/cc @JoaoFula

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 Sep 20, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 20, 2023
@openshift-ci openshift-ci bot requested a review from JoaoFula September 20, 2023 07:17
@ncaak ncaak marked this pull request as ready for review September 20, 2023 07:55
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 20, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncaak

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 requested review from rhrmo and tremes September 20, 2023 07:56
@ncaak
Copy link
Contributor Author

ncaak commented Sep 20, 2023

/test e2e-agnostic-upgrade

@tremes
Copy link
Contributor

tremes commented Sep 20, 2023

/lgtm
/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 Sep 20, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2023
@ncaak
Copy link
Contributor Author

ncaak commented Sep 20, 2023

/test e2e-agnostic-upgrade

@openshift-ci
Copy link

openshift-ci bot commented Sep 20, 2023

@ncaak: 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.

@JoaoFula
Copy link
Contributor

/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 Sep 21, 2023
@openshift-merge-robot openshift-merge-robot merged commit 68e14c2 into openshift:release-4.12 Sep 21, 2023
@openshift-ci-robot
Copy link
Contributor

@ncaak: Jira Issue OCPBUGS-19405: All pull requests linked via external trackers have merged:

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

In response to this:

This is manual cherry-pick of #811

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-merge-robot
Copy link
Contributor

Fix included in accepted release 4.12.0-0.nightly-2023-09-22-110812

@ncaak
Copy link
Contributor Author

ncaak commented Sep 29, 2023

/cherrypick release-4.11

@openshift-cherrypick-robot

@ncaak: #823 failed to apply on top of branch "release-4.11":

Applying: Add workload repo image gathering
Using index info to reconstruct a base tree...
M	pkg/gatherers/workloads/types.go
M	pkg/gatherers/workloads/workloads_info.go
M	pkg/gatherers/workloads/workloads_info_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/gatherers/workloads/workloads_info_test.go
Auto-merging pkg/gatherers/workloads/workloads_info.go
Auto-merging pkg/gatherers/workloads/types.go
Applying: Fix linter
Using index info to reconstruct a base tree...
A	pkg/config/config_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/config/config_test.go deleted in HEAD and modified in Fix linter. Version Fix linter of pkg/config/config_test.go 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 0002 Fix linter
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.11

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants