Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / jjb / opendaylight-infra-copy-ssh-keys.sh

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index 1bf889d7078cc1b56055dc0b604838db7d460e32..c8aa145964b254a15462765c26e5138a861f2d9a 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -11,9 +11,6 @@
 
 echo "----------> Copy ssh public keys to csit lab"
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-
 function copy-ssh-keys-to-slave() {
     RETRIES=60
     for j in $(seq 1 $RETRIES); do
@@ -44,6 +41,14 @@ function copy-ssh-keys-to-slave() {
     done
 }
 
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+lf-activate-venv --python python3 \
+    python-heatclient \
+    python-openstackclient \
+    yq
+
 # Print the Stack outputs parameters so that we can identify which IPs belong
 # to which VM types.
 openstack stack show -c outputs "$STACK_NAME"