summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMartin Kulhavy <martin.kulhavy@nokia.com>2017-08-22 14:07:07 +0300
committerMartin Kulhavy <martin.kulhavy@nokia.com>2017-08-22 14:07:07 +0300
commite4212ab9dc23be9d0aa9f2593e20c78aa0e9c2c2 (patch)
treeb04f4bccb0b5190ab8c89eedae0ea42aa0a8c124 /ci
parent026ed9cccd75b70fd09e048e9cc7d0af60365328 (diff)
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>
Diffstat (limited to 'ci')
-rwxr-xr-xci/03-maasdeploy.sh2
-rwxr-xr-xci/cleanvm.sh2
-rw-r--r--ci/common/tools.sh (renamed from ci/tools.sh)0
-rwxr-xr-xci/deploy.sh2
-rwxr-xr-xci/openstack.sh2
-rw-r--r--ci/setupproxy.sh2
6 files changed, 5 insertions, 5 deletions
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
index 45db67e1..45db67e1 100644
--- a/ci/tools.sh
+++ b/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