Merge "Update to global-jjb v0.12.1"

[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 b5af750fb865f246a833e798a43bca6977bc840f..daa33c3db1d49864e63dc9c3d568ee5957af2593 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -1,10 +1,18 @@
 #!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
 echo "----------> Copy ssh public keys to csit lab"
 
-# shellcheck disable=SC1090
-source "$WORKSPACE/.venv-openstack/bin/activate"
-PYTHON="$WORKSPACE/.venv-openstack/bin/python"
-OPENSTACK="$WORKSPACE/.venv-openstack/bin/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
 
 function copy-ssh-keys-to-slave() {
     RETRIES=60
@@ -33,10 +41,10 @@ function copy-ssh-keys-to-slave() {
 
 # Print the Stack outputs parameters so that we can identify which IPs belong
 # to which VM types.
-$PYTHON $OPENSTACK stack show -c outputs "$STACK_NAME"
+openstack stack show -c outputs "$STACK_NAME"
 
 # shellcheck disable=SC2006
-ADDR=(`$PYTHON $OPENSTACK stack show -f json -c outputs "$STACK_NAME" | \
+ADDR=(`openstack stack show -f json -c outputs "$STACK_NAME" | \
        jq -r '.outputs[] | \
               select(.output_key | match("^vm_[0-9]+_ips\$")) | \
               .output_value | .[]'`)