aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Silvius <s.silvius@partner.samsung.com>2019-05-30 19:02:11 +0300
committerSamuli Silvius <s.silvius@partner.samsung.com>2019-06-05 11:38:13 +0000
commitf83fd0ccbd0949c882cbb19e7c2ee663bde70eb2 (patch)
tree7f8d3b0b285eb10fe394dadeb310109bff8d7f5b
parent574633e73605bfa58872c1e00a82febe7f7f8101 (diff)
Make aio.sh suitable for CI
aio.sh script currently clones multicloud/k8s repo itself. That is unnessary and makes it impossible to hook k8s repository to CI system where commit changeset is used to define repository files to be tested. This commit will remove cloning of multicloud/k8s repository and also move aio.sh to baremetal folder which seems to be the intended place for it. Issue-ID: MULTICLOUD-629 Change-Id: Ifc54bbc1ec06bc4c3fbbecca7e676d5ffa392d78 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
-rwxr-xr-xkud/hosting_providers/baremetal/aio.sh (renamed from kud/hosting_providers/vagrant/aio.sh)11
1 files changed, 5 insertions, 6 deletions
diff --git a/kud/hosting_providers/vagrant/aio.sh b/kud/hosting_providers/baremetal/aio.sh
index 0d06cc65..5b448183 100755
--- a/kud/hosting_providers/vagrant/aio.sh
+++ b/kud/hosting_providers/baremetal/aio.sh
@@ -17,10 +17,9 @@ if [[ $(whoami) != 'root' ]];then
exit 1
fi
-echo "Cloning and configuring KUD project..."
-rm -rf k8s
-git clone https://git.onap.org/multicloud/k8s/
-cd k8s/kud/hosting_providers/baremetal/
+aio_dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+cd ${aio_dir}/../vagrant
+
cat <<EOL > inventory/hosts.ini
[all]
localhost
@@ -47,7 +46,7 @@ localhost
kube-node
kube-master
EOL
-sed -i '/andrewrothstein.kubectl/d' ../../deployment_infra/playbooks/configure-*.yml
+
rm -f ~/.ssh/id_rsa
echo -e "\n\n\n" | ssh-keygen -t rsa -N ""
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
@@ -56,5 +55,5 @@ chmod og-wx ~/.ssh/authorized_keys
echo "Enabling nested-virtualization"
./node.sh
-echo "Deploying KRD project"
+echo "Deploying KUD project"
./installer.sh | tee kud_installer.log