Skip to content

Fix upgrade tests assuming storage.conf exists#13960

Merged
openshift-merge-robot merged 1 commit intocontainers:mainfrom
cevich:fix_upgrade
Apr 21, 2022
Merged

Fix upgrade tests assuming storage.conf exists#13960
openshift-merge-robot merged 1 commit intocontainers:mainfrom
cevich:fix_upgrade

Conversation

@cevich
Copy link
Copy Markdown
Member

@cevich cevich commented Apr 21, 2022

On F36 / podman 4, at the time of this commit there is no
/etc/containers/storage.conf installed by default. Since the
test volume-mounts this file into the container, it was failing. Fix
this by using a conditional volume-mount based on the file existing (or
not).

On F36 / podman 4, at the time of this commit there is no
`/etc/containers/storage.conf` installed by default.  Since the
test volume-mounts this file into the container, it was failing.  Fix
this by using a conditional volume-mount based on the file existing (or
not).

Signed-off-by: Chris Evich <cevich@redhat.com>
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Apr 21, 2022

/approve
LGTM

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 21, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cevich, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2022
@TomSweeneyRedHat
Copy link
Copy Markdown
Member

nifty fix @cevich
LGTM

@TomSweeneyRedHat
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 21, 2022
@openshift-merge-robot openshift-merge-robot merged commit 077e7c5 into containers:main Apr 21, 2022
@cevich cevich deleted the fix_upgrade branch April 18, 2023 14:49
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Aug 29, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 29, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants