Use common clone repo function

Remove unused kud_launch.sh script.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Ic041a6f75fa5d53011b1c3c285e75205aabe6b3d

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index d9ab84d..963e528 100755 (executable)
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -8,19 +8,10 @@ source $LIBDIR/env/lib/common.sh
 export KUBESPRAY_VERSION=2.16.0
 
 function get_kud_repo {
-    if [ -d $DOWNLOAD_PATH/multicloud-k8s ]; then
-        rm -rf $DOWNLOAD_PATH/multicloud-k8s
-    fi
-
-    mkdir -p $DOWNLOAD_PATH
-    pushd $DOWNLOAD_PATH
+    clone_kud_repository
     if [ "$1" == "v1" ] ; then
         export KUD_ADDONS=multus
-        git clone https://github.com/onap/multicloud-k8s.git
-    else
-        git clone https://github.com/onap/multicloud-k8s.git
     fi
-    popd
 }
 
 function set_ssh_key {
@@ -37,7 +28,7 @@ function set_ssh_key {
 }
 
 function set_bm_kud {
-    pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/inventory
+    pushd ${KUDPATH}/kud/hosting_providers/vagrant/inventory
     HOST_IP=${HOST_IP:-$(hostname -I | cut -d ' ' -f 1)}
     if [ "$1" == "minimal" ] ; then
         cat <<EOL > hosts.ini
@@ -89,7 +80,7 @@ EOL
 }
 
 function kud_install {
-    pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
+    pushd ${KUDPATH}/kud/hosting_providers/vagrant/
     if [ "$1" == "all" ]; then
         sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
     fi
@@ -97,7 +88,7 @@ function kud_install {
 
     if [ "$1" == "bm" ]; then
         for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do
-            pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
+            pushd ${KUDPATH}/kud/tests/
                 bash ${addon}.sh
             popd
         done
@@ -106,7 +97,7 @@ function kud_install {
 }
 
 function kud_reset {
-    pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
+    pushd ${KUDPATH}/kud/hosting_providers/vagrant/
     ansible-playbook -i inventory/hosts.ini /opt/kubespray-${KUBESPRAY_VERSION}/reset.yml \
         --become --become-user=root -e reset_confirmation=yes
     popd

diff --git a/deploy/kud/kud_launch.sh b/deploy/kud/kud_launch.sh
deleted file mode 100755 (executable)
index 53d7154..0000000
--- a/deploy/kud/kud_launch.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -eu -o pipefail
-
-LIBDIR="$(dirname "$(dirname "$PWD")")"
-
-source $LIBDIR/env/lib/common.sh
-
-if [ ! -d $DOWNLOAD_PATH/multicloud-k8s ]; then
-       pushd $DOWNLOAD_PATH
-       git clone https://github.com/onap/multicloud-k8s.git
-       popd
-fi

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 1e633b6..0de8406 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-DOWNLOAD_PATH=${DOWNLOAD_PATH:-/opt/icn}
-
 IRONIC_DATA_DIR=${IRONIC_DATA_DIR:-"/opt/ironic"}
 #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it
 IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
@@ -18,7 +16,15 @@ BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
 BMOPATH="/opt/src/github.com/metal3-io/baremetal-operator"
 #Bare Metal Operator version to use
 BMO_VERSION="capm3-v0.5.1"
-#Discard existing baremetal operator repo directory
+
+#KuD repository URL
+KUDREPO="${KUDREPO:-https://github.com/onap/multicloud-k8s.git}"
+#Path to clone the KuD repo
+KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
+#KuD version to use
+KUD_VERSION="ed96bca7fe415f1636d82c26af15d7474bdfe876"
+
+#Discard existing repo directory
 FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-true}"
 
 # The kustomize version to use
@@ -171,25 +177,36 @@ function wait_for {
     done
 }
 
-function clone_baremetal_operator_repository {
-    mkdir -p $(dirname ${BMOPATH})
-    if [[ -d ${BMOPATH} && "${FORCE_REPO_UPDATE}" == "true" ]]; then
-       rm -rf "${BMOPATH}"
+function clone_repository {
+    local -r path=$1
+    local -r repo=$2
+    local -r version=$3
+    mkdir -p $(dirname ${path})
+    if [[ -d ${path} && "${FORCE_REPO_UPDATE}" == "true" ]]; then
+       rm -rf "${path}"
     fi
-    if [ ! -d "${BMOPATH}" ] ; then
-        pushd $(dirname ${BMOPATH})
-        git clone "${BMOREPO}"
+    if [ ! -d "${path}" ] ; then
+        pushd $(dirname ${path})
+        git clone "${repo}"
         popd
     else
-       pushd "${BMOPATH}"
+       pushd "${path}"
        git fetch
        popd
     fi
-    pushd "${BMOPATH}"
-    git reset --hard "${BMO_VERSION}"
+    pushd "${path}"
+    git reset --hard "${version}"
     popd
 }
 
+function clone_baremetal_operator_repository {
+    clone_repository ${BMOPATH} ${BMOREPO} ${BMO_VERSION}
+}
+
+function clone_kud_repository {
+    clone_repository ${KUDPATH} ${KUDREPO} ${KUD_VERSION}
+}
+
 function install_kustomize {
     curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" -o kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
     tar xzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --no-same-owner