openshift / must-gather-operator

Operator to enable CEE members to collect must-gathers from OSDv4 clusters
Apache License 2.0
8 stars 45 forks source link

Bump ubi8/ubi-minimal from 8.10-1052 to 8.10-1052.1724178568 in /build #189

Closed dependabot[bot] closed 1 month ago

dependabot[bot] commented 2 months ago

Bumps ubi8/ubi-minimal from 8.10-1052 to 8.10-1052.1724178568.

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
openshift-ci[bot] commented 2 months ago

Hi @dependabot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
codecov-commenter commented 2 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 38.24%. Comparing base (924b102) to head (f236e21).

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/openshift/must-gather-operator/pull/189/graphs/tree.svg?width=650&height=150&src=pr&token=UFO0L709WA&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift)](https://app.codecov.io/gh/openshift/must-gather-operator/pull/189?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift) ```diff @@ Coverage Diff @@ ## master #189 +/- ## ======================================= Coverage 38.24% 38.24% ======================================= Files 5 5 Lines 387 387 ======================================= Hits 148 148 Misses 236 236 Partials 3 3 ```
openshift-ci[bot] commented 2 months ago

@dependabot[bot]: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-ci[bot] commented 1 month ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dependabot[bot], mjlshen

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](https://github.com/openshift/must-gather-operator/blob/master/OWNERS)~~ [mjlshen] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
mmazur commented 1 month ago

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 release-4.13 release-4.12

openshift-cherrypick-robot commented 1 month ago

@mmazur: #189 failed to apply on top of branch "release-4.17":

Applying: Bump ubi8/ubi-minimal from 8.10-1052 to 8.10-1052.1724178568 in /build
Using index info to reconstruct a base tree...
M   build/Dockerfile
M   build/Dockerfile.olm-registry
Falling back to patching base and 3-way merge...
Auto-merging build/Dockerfile.olm-registry
CONFLICT (content): Merge conflict in build/Dockerfile.olm-registry
Auto-merging build/Dockerfile
CONFLICT (content): Merge conflict in build/Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump ubi8/ubi-minimal from 8.10-1052 to 8.10-1052.1724178568 in /build
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](https://github.com/openshift/must-gather-operator/pull/189#issuecomment-2340735554): >/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 release-4.13 release-4.12 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
mmazur commented 1 month ago

/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 release-4.12

openshift-cherrypick-robot commented 1 month ago

@mmazur: new pull request created: #195

In response to [this](https://github.com/openshift/must-gather-operator/pull/189#issuecomment-2341000070): >/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 release-4.12 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.