From: Martin Kulhavy <martin.kulhavy@nokia.com>
Date: Tue, 22 Aug 2017 11:07:07 +0000 (+0300)
Subject: Move tools.sh to ci/common dir
X-Git-Tag: opnfv-5.0.RC1~34
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F39863%2F1;p=joid.git

Move tools.sh to ci/common dir

This file is only sourced by other script and is not meant to be
executed (contains only functions).

Change-Id: I41253b73f720e4b7e987c5164901253c7e51ee8b
Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
---

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index fb599e68..988ea839 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -2,7 +2,7 @@
 #placeholder for deployment script.
 set -ex
 
-source tools.sh
+source common/tools.sh
 
 
 usage() {
diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index 8d6fe88d..0fa6b869 100755
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -2,7 +2,7 @@
 
 set -x
 
-source tools.sh
+source common/tools.sh
 
 echo_info "Cleanup Started..."
 
diff --git a/ci/tools.sh b/ci/common/tools.sh
similarity index 100%
rename from ci/tools.sh
rename to ci/common/tools.sh
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8a08f57d..066b457b 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-source tools.sh
+source common/tools.sh
 
 #need to put multiple cases here where decide this bundle to deploy by default use the odl bundle.
 # Below parameters are the default and we can according the release
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 0e2f9e4d..151e60e7 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -8,7 +8,7 @@
 
 set -ex
 
-source tools.sh
+source common/tools.sh
 
 #./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
 
diff --git a/ci/setupproxy.sh b/ci/setupproxy.sh
index 61eabcd9..913252fc 100644
--- a/ci/setupproxy.sh
+++ b/ci/setupproxy.sh
@@ -28,7 +28,7 @@
 ##############################################################################
 
 # Imports
-source tools.sh
+source common/tools.sh
 
 # Halt on error
 set -e