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.

Sign up for GitHub

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

Jump to bottom

deps: update pcidb to 1.0.0, ghw to 0.9.0 #229

Merged
merged 3 commits into from
Mar 28, 2022
Merged

deps: update pcidb to 1.0.0, ghw to 0.9.0 #229

merged 3 commits into from
Mar 28, 2022

Conversation

ffromani
Copy link
Member

This version of pcidb switched the default: now the automatic
fetch of pcidb from the network is opt-in.

Signed-off-by: Francesco Romani [email protected]

@ffromani
deps: require pcidb 1.0.0
64ffd35 
This version of pcidb switched the default: now the automatic
fetch of pcidb from the network is opt-in.

Signed-off-by: Francesco Romani <[email protected]>
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 24, 2022
@ffromani ffromani added the cherry-pick-candidate Possible cherry-pick in the future label Mar 24, 2022
@ffromani
Copy link
Member Author

/cherry-pick release-4.10

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.10

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.

@ffromani
Copy link
Member Author

xref: jaypipes/pcidb#28
note we have caching in place (https://github.com/openshift-kni/numaresources-operator/blob/main/Dockerfile.openshift#L7) which make unlikely for this project to have contributed to the request storm; still, having this change is good per se.

ffromani added 2 commits March 25, 2022 12:45
@ffromani
Dockerfile: install hwdata, not pciutils
6989af0 
We need to make sure to have the pci.ids database in the
container image, but to do so it's sufficient to install
the `hwdata` package, we don't really need the `pciutils`
(which would pull in `hwdata` as dependency).

Signed-off-by: Francesco Romani <[email protected]>
@ffromani
deps: update to ghw 0.9.0
3e658e2 
Consume latest release 0.9.0

Signed-off-by: Francesco Romani <[email protected]>
@ffromani ffromani changed the title deps: require pcidb 1.0.0 deps: update pcidb to 1.0.0, ghw to 0.9.0 Mar 25, 2022
@ffromani
Copy link
Member Author

/test ci-install-e2e

@ffromani
Copy link
Member Author

/test ci-e2e

@ffromani
Copy link
Member Author

/test ci-install-e2e

@ffromani ffromani requested a review from Tal-or March 28, 2022 07:05
@Tal-or
Copy link
Collaborator

Tal-or commented Mar 28, 2022

/lgtm
/approve

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

openshift-ci bot commented Mar 28, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fromanirh, Tal-or

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

@ffromani ffromani merged commit 5cab056 into main Mar 28, 2022
@ffromani ffromani deleted the update-pcidb-1.0.0 branch March 28, 2022 07:29
@openshift-cherrypick-robot
Copy link

@fromanirh: #229 failed to apply on top of branch "release-4.10":

Applying: deps: require pcidb 1.0.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/github.com/jaypipes/pcidb/Gopkg.toml
Removing vendor/github.com/jaypipes/pcidb/Gopkg.lock
Removing vendor/github.com/jaypipes/pcidb/.travis.yml
Removing vendor/github.com/jaypipes/pcidb/.get-go-packages.sh
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 deps: require pcidb 1.0.0
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.10

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.

@ffromani ffromani mentioned this pull request Mar 28, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cynepco3hahue cynepco3hahue Awaiting requested review from cynepco3hahue

@jlojosnegros jlojosnegros Awaiting requested review from jlojosnegros

@Tal-or Tal-or Awaiting requested review from Tal-or

Assignees

@Tal-or Tal-or

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-candidate Possible cherry-pick in the future lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ffromani @openshift-cherrypick-robot @Tal-or