containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24515 from edsantiago/kube-template 

system tests: safer install_kube_template()
This commit is contained in:
openshift-merge-bot[bot] 2024-11-11 20:51:21 +00:00 committed by GitHub
parent 50714d2455 969417711d
commit 7a3e8da8ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/system/helpers.systemd.bash
View File

@ -65,13 +65,18 @@ install_kube_template() {
# If running from a podman source directory, build and use the source # If running from a podman source directory, build and use the source
# version of the play-kube-@ unit file # version of the play-kube-@ unit file
unit_name="podman-kube@.service" unit_name="podman-kube@.service"
unit_file="contrib/systemd/system/${unit_name}" unit_file_in="contrib/systemd/system/${unit_name}.in"
if [[ -e ${unit_file}.in ]]; then if [[ -e $unit_file_in ]]; then
echo "# [Building & using $unit_name from source]" >&3 unit_file_out=$UNIT_DIR/$unit_name
# Force regenerating unit file (existing one may have /usr/bin path) sed -e "s;@@PODMAN@@;$PODMAN;g" <$unit_file_in >$unit_file_out.tmp.$$ \
rm -f $unit_file && mv $unit_file_out.tmp.$$ $unit_file_out
BINDIR=$(dirname $PODMAN) make $unit_file elif [[ "$PODMAN" = "/usr/bin/podman" ]]; then
cp $unit_file $UNIT_DIR/$unit_name # Not running from a source directory. This is expected in gating,
# and is probably OK, but it could fail on a misinstalled setup.
# Maintainer will only see this warning in case of test failure.
echo "WARNING: Test will rely on system-installed unit files." >&2
else
skip "No $unit_file_in, and PODMAN=$PODMAN"
fi fi
} }