diff options
| author |   Ritu Sood <ritu.sood@intel.com> | 2021-05-10 21:25:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-05-10 21:25:48 +0000 |
| commit | 59a703bb8c443c2b7d6b7cdab9e8448b944e5cf2 (patch) | |
| tree | 3e208cf9740d90f6e8a0bdb8a70b11707a8c9b43 /kud/tests | |
| parent | 3f5cacd8a183aa9feee9fb0cdc6231215c19c206 (diff) | |
| parent | cc302424c0b129267235157640be28b45597fef2 (diff) | |
Merge "EMCO deploy of addons"
Diffstat (limited to 'kud/tests')
| -rwxr-xr-x | kud/tests/_functions.sh | 5 | ||||
| -rwxr-xr-x | kud/tests/multus.sh | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | kud/tests/sriov-network.sh | 0 |
3 files changed, 7 insertions, 2 deletions
diff --git a/kud/tests/_functions.sh b/kud/tests/_functions.sh index 720470eb..7a3e97ab 100755 --- a/kud/tests/_functions.sh +++ b/kud/tests/_functions.sh @@ -25,6 +25,11 @@ function print_msg { echo -e "${RED} $msg ---------------------------------------${NC}" } +function ssh_cluster { + master_ip=$(kubectl cluster-info | grep "Kubernetes master" | awk -F '[:/]' '{print $4}') + ssh -o StrictHostKeyChecking=no ${master_ip} -- "$@" +} + function get_ovn_central_address { #Reuse OVN_CENTRAL_ADDRESS if available (bypassable by --force flag) if [[ "${1:-}" != "--force" ]] && [[ -n "${OVN_CENTRAL_ADDRESS:-}" ]]; then diff --git a/kud/tests/multus.sh b/kud/tests/multus.sh index ad3a3909..4f94791f 100755 --- a/kud/tests/multus.sh +++ b/kud/tests/multus.sh @@ -41,7 +41,7 @@ NET function generate_CRD_for_macvlan_cni { local csar_id=$1 - local master_name=`route | grep 'default' | awk '{print $8}' |head -n 1` + local master_name=$(ssh_cluster route | grep 'default' | awk '{print $8}' |head -n 1) _checks_args $csar_id pushd ${CSAR_DIR}/${csar_id} @@ -67,7 +67,7 @@ NET function generate_CRD_for_ipvlan_cni { local csar_id=$1 - local master_name=`route | grep 'default' | awk '{print $8}' |head -n 1` + local master_name=$(ssh_cluster route | grep 'default' | awk '{print $8}' |head -n 1) _checks_args $csar_id pushd ${CSAR_DIR}/${csar_id} diff --git a/kud/tests/sriov-network.sh b/kud/tests/sriov-network.sh index 3191c2f3..3191c2f3 100644..100755 --- a/kud/tests/sriov-network.sh +++ b/kud/tests/sriov-network.sh |