system tests: avoid rmi -a ... plus cleanup #14600
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: edsantiago 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 |
openshift-ci
bot
added
the
approved
| @@ -295,6 +296,8 @@ LISTEN_FDNAMES=listen_fdnames" | sort) | |||
| unit_file="contrib/systemd/system/${unit_name}" | |||
| if [[ -e ${unit_file}.in ]]; then | |||
| echo "# [Building & using $unit_name from source]" >&3 | |||
| # Force regenerating unit file (existing one may have /usr/bin path) | |||
| rm -f $unit_file | |||
There was a problem hiding this comment.
Oh, this was nasty. Basically, the unit file already existed, and had hardcoded /usr/bin/podman. Nuff said.
|
@Luap99 looks like the new linter is breaking all PRs; are you aware of this? |
test/system/250-systemd.bats
Outdated
| @@ -82,32 +80,34 @@ function service_cleanup() { | |||
|
|
|||
| # All good. Stop service, clean up. | |||
| # Also make sure the service is in the `inactive` state (see #11304). | |||
| service_cleanup inactive | |||
There was a problem hiding this comment.
looks like this is not actually doing what the comment is saying, #11304
There was a problem hiding this comment.
Oops - forgot to remove that comment. Thanks.
There was a problem hiding this comment.
Well that just removes the regression test for this issue then (I understand that it did not actually worked before)? It looks like we should check for the unit status.
There was a problem hiding this comment.
Oh all right. I've taken the time to understand the issue and figure out the magic systemd incantations. I was not, however, able to test using podman v3.3.0 because that version is way too old to run on my system (I finally gave up on a containers.conf incompatibility). New check is my best guess at addressing the original intention.
I noticed 'rmi -a' in a test. I tried to fix it. Hilarity ensued. 'rmi -a' is evil: it forces a fresh pull of our test image, which in turn almost guarantees a flake some day. We avoid it, but once in a while it slips in. While fixing it, I noticed a bevy of other problems that needed cleanup. Signed-off-by: Ed Santiago <[email protected]>
|
/lgtm |
github-actions
bot
added
the
locked - please file new issue/PR
I noticed 'rmi -a' in a test. I tried to fix it. Hilarity ensued.
'rmi -a' is evil: it forces a fresh pull of our test image,
which in turn almost guarantees a flake some day. We avoid
it, but once in a while it slips in.
While fixing it, I noticed a bevy of other problems that
needed cleanup.
Signed-off-by: Ed Santiago [email protected]