Merge "Remove references to distribution-deploy-*"

[releng/builder.git] / jjb / integration / copy-common-functions.sh

diff --git a/jjb/integration/copy-common-functions.sh b/jjb/integration/copy-common-functions.sh
index e0eacdf0c1bb5dfba298f0790a1684e3f963a2ba..660dbacaf6a3dc1eb174dae20e358d2f4d96bb0a 100644 (file)
--- a/jjb/integration/copy-common-functions.sh
+++ b/jjb/integration/copy-common-functions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 
 # Copy the whole script to /tmp/common-functions.sh and to remote nodes but
 # only if this script itself is executing and not sourced. jenkins prepends this
@@ -7,15 +7,21 @@
 # script is executing rather than being sourced. When executed the condition
 # is true and copies the script. In the false path this copy below is skipped
 # and the sourcing continues so that the appended common-function.sh ends up sourced.
-if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    # shellcheck disable=SC1090
+    . ~/lf-env.sh
+
+    lf-activate-venv --python python3 \
+        python-heatclient \
+        python-openstackclient
+
     echo "Copying common-functions.sh to /tmp"
     cp "${0}" /tmp/common-functions.sh
 
-    source /tmp/v/openstack/bin/activate
     mapfile -t ips <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
     for ip in "${ips[@]}"; do
         echo "Copying common-functions.sh to ${ip}:/tmp"
-        scp /tmp/common-functions.sh ${ip}:/tmp
+        scp /tmp/common-functions.sh "${ip}:/tmp"
     done
     exit 0
 fi