libvirt: Fix shell reload

I experimented with moving the shell reload straight after the pipx ensurepath when discussing this with Magnus, but in the GHA once merged this doesn't seem to be working as the reload means the script ends, so we need to move this back. As a further measure to protect the CI, only run the shell reload if $CI != true. Signed-off-by: stevenhorsman <[email protected]>
confidential-containers · Dec 17, 2024 · 2592209 · 2592209
1 parent 8f534e3
commit 2592209
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/cloud-api-adaptor/libvirt/config_libvirt.sh b/src/cloud-api-adaptor/libvirt/config_libvirt.sh
@@ -86,8 +86,6 @@ installKcli() {
             # export PATH="$PATH:$HOME/.local/bin"
             pipx install kcli==${kcli_version}
             pipx ensurepath
-            # Reload shell so that pipx install PATH is available
-            exec $SHELL
         else
             sudo pip3 install kcli==${kcli_version}
         fi
@@ -140,3 +138,8 @@ case $TEST_E2E_SECURE_COMMS in
     echo "SECURE_COMMS=\"false\"" >> libvirt.properties
     ;;
 esac
+
+if [[ "${OS_DISTRO}" == "ubuntu" ]] && [[ "${CI:-}" != "true" ]]; then
+    # Reload shell so that pipx install PATH is available
+    exec $SHELL
+fi