[release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present #1432

shawn-hurley · 2020-04-07T19:30:16Z

Description of the change:
Manual cherry-pick of: #1220

Motivation for the change:

Reviewer Checklist

Implementation matches the proposed design, or proposal is updated to match implementation
Sufficient unit test coverage
Sufficient end-to-end test coverage
Docs updated or added to /docs
Commit messages sensible and descriptive

openshift-ci-robot · 2020-04-07T19:30:20Z

@shawn-hurley: This pull request references Bugzilla bug 1821318, which is invalid:

expected dependent Bugzilla bug 1796080 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
expected dependent Bugzilla bug 1819891 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is CLOSED (DUPLICATE) instead
expected dependent Bugzilla bug 1796080 to target the "4.4.0" release, but it targets "4.2.z" instead
expected dependent Bugzilla bug 1819891 to target the "4.4.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 1821318: feat(packagemanifest): add default os/arch labels if not present

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.

pkg/package-server/storage/subresources_test.go

shawn-hurley · 2020-04-07T19:40:56Z

/bugzilla refresh

openshift-ci-robot · 2020-04-07T19:41:01Z

@shawn-hurley: This pull request references Bugzilla bug 1821318, which is invalid:

expected dependent Bugzilla bug 1796080 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
expected dependent Bugzilla bug 1819891 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is CLOSED (DUPLICATE) instead
expected dependent Bugzilla bug 1796080 to target the "4.4.0" release, but it targets "4.2.z" instead
expected dependent Bugzilla bug 1819891 to target the "4.4.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:

/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 · 2020-04-07T19:51:05Z

@shawn-hurley: This pull request references Bugzilla bug 1821318, which is invalid:

expected dependent Bugzilla bug 1796080 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
expected dependent Bugzilla bug 1819891 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is CLOSED (DUPLICATE) instead
expected dependent Bugzilla bug 1796080 to target the "4.4.0" release, but it targets "4.2.z" instead
expected dependent Bugzilla bug 1819891 to target the "4.4.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:

[release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present

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.

ecordell · 2020-04-07T20:25:48Z

/test unit

shawn-hurley · 2020-04-07T20:28:31Z

/bugzilla refresh

openshift-ci-robot · 2020-04-07T20:28:36Z

@shawn-hurley: This pull request references Bugzilla bug 1821318, which is invalid:

expected dependent Bugzilla bug 1796080 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
expected dependent Bugzilla bug 1819891 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is CLOSED (DUPLICATE) instead
expected dependent Bugzilla bug 1796080 to target the "4.4.0" release, but it targets "4.2.z" instead
expected dependent Bugzilla bug 1819891 to target the "4.4.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:

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

ecordell · 2020-04-07T20:42:49Z

/test unit

ecordell · 2020-04-08T13:28:14Z

the unit test failure looks legit and related to these changes

shawn-hurley · 2020-04-08T16:49:44Z

/bugzilla refresh

openshift-ci-robot · 2020-04-08T16:49:49Z

@shawn-hurley: This pull request references Bugzilla bug 1821318, which is invalid:

expected dependent Bugzilla bug 1796080 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
expected dependent Bugzilla bug 1819891 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is CLOSED (DUPLICATE) instead
expected dependent Bugzilla bug 1796080 to target the "4.4.0" release, but it targets "4.2.z" instead
expected dependent Bugzilla bug 1819891 to target the "4.4.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:

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

shawn-hurley · 2020-04-28T16:30:33Z

/retest

shawn-hurley · 2020-04-28T16:32:50Z

/bugzilla refresh

openshift-ci-robot · 2020-04-28T16:32:56Z

@shawn-hurley: This pull request references Bugzilla bug 1821318, which is invalid:

expected dependent Bugzilla bug 1796080 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
expected dependent Bugzilla bug 1819891 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is CLOSED (DUPLICATE) instead
expected dependent Bugzilla bug 1796080 to target a release in 4.4.0, 4.4.z, but it targets "4.2.z" instead
expected dependent Bugzilla bug 1819891 to target a release in 4.4.0, 4.4.z, 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:

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

shawn-hurley · 2020-04-28T16:34:00Z

/bugzilla refresh

openshift-ci-robot · 2020-04-28T16:34:08Z

@shawn-hurley: This pull request references Bugzilla bug 1821318, 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.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.3.z) matches configured target release for branch (4.3.z)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1804851 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1804851 targets the "4.4.0" release, which is one of the valid target releases: 4.4.0, 4.4.z
bug has dependents

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.

ecordell · 2020-04-28T17:22:00Z

/approve
/lgtm

openshift-ci-robot · 2020-04-28T17:22:12Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, shawn-hurley

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:

~~OWNERS~~ [ecordell]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2020-04-28T18:08:15Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-04-28T20:05:44Z

/retest

Please review the full test history for this PR and help us cut down flakes.

sdodson · 2020-05-01T14:41:26Z

@shawn-hurley Can you cherry-pick-approved this PR while I track down why I was removed from the operator-framework org?

openshift-bot · 2020-05-01T19:18:43Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-05-01T19:31:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-05-01T20:10:42Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2020-05-01T21:05:34Z

@shawn-hurley: All pull requests linked via external trackers have merged: operator-framework/operator-lifecycle-manager#1432. Bugzilla bug 1821318 has been moved to the MODIFIED state.

In response to this:

[release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present

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.

shawn-hurley · 2020-05-06T13:17:31Z

/cherry-pick release-4.2

openshift-cherrypick-robot · 2020-05-06T13:17:40Z

@shawn-hurley: #1432 failed to apply on top of branch "release-4.2":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/package-server/provider/registry.go
M	pkg/package-server/provider/registry_test.go
M	pkg/package-server/storage/reststorage.go
M	pkg/package-server/storage/subresources_test.go
M	test/e2e/packagemanifest_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/packagemanifest_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/packagemanifest_e2e_test.go
Auto-merging pkg/package-server/storage/subresources_test.go
Auto-merging pkg/package-server/storage/reststorage.go
CONFLICT (content): Merge conflict in pkg/package-server/storage/reststorage.go
Auto-merging pkg/package-server/provider/registry_test.go
CONFLICT (content): Merge conflict in pkg/package-server/provider/registry_test.go
Auto-merging pkg/package-server/provider/registry.go
CONFLICT (content): Merge conflict in pkg/package-server/provider/registry.go
Patch failed at 0001 feat(packagemanifest): add default os/arch labels if not present

In response to this:

/cherry-pick release-4.2

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 added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Apr 7, 2020

openshift-ci-robot requested review from ecordell and njhale April 7, 2020 19:30

shawn-hurley changed the title ~~Bug 1821318: feat(packagemanifest): add default os/arch labels if not present~~ [release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present Apr 7, 2020

ecordell reviewed Apr 7, 2020

View reviewed changes

pkg/package-server/storage/subresources_test.go Show resolved Hide resolved

shawn-hurley force-pushed the bug-1821318 branch from 15b024a to c467a26 Compare April 7, 2020 19:56

feat(packagemanifest): add default os/arch labels if not present

1aa3282

shawn-hurley force-pushed the bug-1821318 branch from c467a26 to 1aa3282 Compare April 8, 2020 16:49

benjaminapetersen mentioned this pull request Apr 28, 2020

[release-4.3] Bug 1796079: Backport OLM filter by OS and ARCH openshift/console#4928

Merged

openshift-ci-robot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Apr 28, 2020

openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 28, 2020

openshift-ci-robot assigned ecordell Apr 28, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2020

shawn-hurley added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 1, 2020

openshift-merge-robot merged commit 7048c43 into operator-framework:release-4.3 May 1, 2020

adellape mentioned this pull request Jun 9, 2020

[enterprise-4.3] Adding multiarch docs for Operator SDK openshift/openshift-docs#22792

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present #1432

[release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present #1432

shawn-hurley commented Apr 7, 2020 •

edited

openshift-ci-robot commented Apr 7, 2020

shawn-hurley commented Apr 7, 2020

openshift-ci-robot commented Apr 7, 2020

openshift-ci-robot commented Apr 7, 2020

ecordell commented Apr 7, 2020

shawn-hurley commented Apr 7, 2020

openshift-ci-robot commented Apr 7, 2020

ecordell commented Apr 7, 2020

ecordell commented Apr 8, 2020

shawn-hurley commented Apr 8, 2020

openshift-ci-robot commented Apr 8, 2020

shawn-hurley commented Apr 28, 2020

shawn-hurley commented Apr 28, 2020

openshift-ci-robot commented Apr 28, 2020

shawn-hurley commented Apr 28, 2020

openshift-ci-robot commented Apr 28, 2020

ecordell commented Apr 28, 2020

openshift-ci-robot commented Apr 28, 2020

openshift-bot commented Apr 28, 2020

openshift-bot commented Apr 28, 2020

sdodson commented May 1, 2020

openshift-bot commented May 1, 2020

openshift-bot commented May 1, 2020

openshift-bot commented May 1, 2020

openshift-ci-robot commented May 1, 2020

shawn-hurley commented May 6, 2020

openshift-cherrypick-robot commented May 6, 2020

[release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present #1432

[release-4.3] Bug 1821318: feat(packagemanifest): add default os/arch labels if not present #1432

Conversation

shawn-hurley commented Apr 7, 2020 • edited

openshift-ci-robot commented Apr 7, 2020

shawn-hurley commented Apr 7, 2020

openshift-ci-robot commented Apr 7, 2020

openshift-ci-robot commented Apr 7, 2020

ecordell commented Apr 7, 2020

shawn-hurley commented Apr 7, 2020

openshift-ci-robot commented Apr 7, 2020

ecordell commented Apr 7, 2020

ecordell commented Apr 8, 2020

shawn-hurley commented Apr 8, 2020

openshift-ci-robot commented Apr 8, 2020

shawn-hurley commented Apr 28, 2020

shawn-hurley commented Apr 28, 2020

openshift-ci-robot commented Apr 28, 2020

shawn-hurley commented Apr 28, 2020

openshift-ci-robot commented Apr 28, 2020

ecordell commented Apr 28, 2020

openshift-ci-robot commented Apr 28, 2020

openshift-bot commented Apr 28, 2020

openshift-bot commented Apr 28, 2020

sdodson commented May 1, 2020

openshift-bot commented May 1, 2020

openshift-bot commented May 1, 2020

openshift-bot commented May 1, 2020

openshift-ci-robot commented May 1, 2020

shawn-hurley commented May 6, 2020

openshift-cherrypick-robot commented May 6, 2020

shawn-hurley commented Apr 7, 2020 •

edited