From: Yolanda Robla <yroblamo@redhat.com>
Date: Wed, 31 Jul 2019 08:53:56 +0000 (+0200)
Subject: Modify libvirt deploy to run from internal repo
X-Git-Tag: akraino_r2~40
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F1290%2F1;p=kni%2Finstaller.git

Modify libvirt deploy to run from internal repo

Adapt some of the clones and references to folder,
to use this internal repo instead of relying
on ci-management.

Signed-off-by: Yolanda Robla <yroblamo@redhat.com>
Change-Id: Ic8df9ef32536793a873fe8c14b994b7259b742ed
---

diff --git a/ci/kni_deploy_libvirt.sh b/ci/kni_deploy_libvirt.sh
index f5d1932..c8b045e 100755
--- a/ci/kni_deploy_libvirt.sh
+++ b/ci/kni_deploy_libvirt.sh
@@ -23,30 +23,11 @@ SITE_NAME='testing.virt.edge-sites.net'
 echo '---> Starting kni installer generation'
 export GOPATH=${WORKSPACE}/
 
-function approve_certs() {
-    # sleep for the first 10 min
-    sleep 600
-
-    # temporary fix, autoapprove certificates on background
-    while /bin/true; do
-        export KUBECONFIG=$HOME/.kni/${SITE_NAME}/final_manifests/auth/kubeconfig
-        oc get csr | grep worker | grep Pending | awk '{print $1}' | xargs -n 1 oc adm certificate approve || true
-        sleep 60
-    done
-}
-
-# move the blueprint to an inner directory
-mkdir ${WORKSPACE}/blueprint-pae
-mv base profiles sites tools ${WORKSPACE}/blueprint-pae/
-
-# clone installer in the right directory
-sudo rm -rf ${WORKSPACE}/${KNI_PATH}
-mkdir -p ${WORKSPACE}/${KNI_PATH}
-pushd ${WORKSPACE}/${KNI_PATH}/
-git clone https://gerrit.akraino.org/r/kni/installer
-pushd installer
-
 # first build kni installer
+sudo rm -rf ${WORKSPACE}/${KNI_PATH}
+mkdir -p ${WORKSPACE}/${KNI_PATH}/installer
+cp -a installer ${WORKSPACE}/${KNI_PATH}/
+pushd ${WORKSPACE}/${KNI_PATH}/installer
 make build 2>&1 | tee ${WORKSPACE}/build.log
 
 # do a host preparation and cleanup