summaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-11-06 18:06:58 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-06 18:06:58 +0000
commit7fbcfe9aa0c049c05aa9cd8bbf6c62796a1f109f (patch)
treed245353d90f8585172924a35ee5de601b7ab9b5b /bootstrap/vagrant-onap
parent83a23ba3ca198bca3a9069958fb5a7f342359a2c (diff)
parent7abf1a8ea14252fa55bf7da0575ad0ff21f41d61 (diff)
Merge "Add debug support"
Diffstat (limited to 'bootstrap/vagrant-onap')
-rw-r--r--bootstrap/vagrant-onap/Vagrantfile1
-rwxr-xr-xbootstrap/vagrant-onap/lib/aai2
-rwxr-xr-xbootstrap/vagrant-onap/lib/appc2
-rwxr-xr-xbootstrap/vagrant-onap/lib/ccsdk2
-rwxr-xr-xbootstrap/vagrant-onap/lib/commons30
-rwxr-xr-xbootstrap/vagrant-onap/lib/dcae2
-rwxr-xr-xbootstrap/vagrant-onap/lib/functions21
-rwxr-xr-xbootstrap/vagrant-onap/lib/mr2
-rwxr-xr-xbootstrap/vagrant-onap/lib/mso2
-rwxr-xr-xbootstrap/vagrant-onap/lib/multicloud2
-rwxr-xr-xbootstrap/vagrant-onap/lib/policy2
-rwxr-xr-xbootstrap/vagrant-onap/lib/portal2
-rwxr-xr-xbootstrap/vagrant-onap/lib/robot2
-rwxr-xr-xbootstrap/vagrant-onap/lib/sdc2
-rwxr-xr-xbootstrap/vagrant-onap/lib/sdnc2
-rwxr-xr-xbootstrap/vagrant-onap/lib/vfc2
-rwxr-xr-xbootstrap/vagrant-onap/lib/vid2
-rw-r--r--bootstrap/vagrant-onap/lib/vnfsdk2
-rw-r--r--bootstrap/vagrant-onap/lib/vvp2
-rwxr-xr-xbootstrap/vagrant-onap/tests/asserts2
-rwxr-xr-xbootstrap/vagrant-onap/vagrant_utils/postinstall.sh4
-rwxr-xr-xbootstrap/vagrant-onap/vagrant_utils/unit_testing.sh4
22 files changed, 35 insertions, 59 deletions
diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile
index 2490b1c75..0664e5fbb 100644
--- a/bootstrap/vagrant-onap/Vagrantfile
+++ b/bootstrap/vagrant-onap/Vagrantfile
@@ -23,6 +23,7 @@ configuration = {
'openstack_password' => '',
'odl_version' => '0.5.3-Boron-SR3',
# Parameters for enabling features
+ 'debug' => 'True',
'build_image' => 'True',
'clone_repo' => 'True',
'compile_repo' => 'False',
diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai
index d267e020d..538ad2c02 100755
--- a/bootstrap/vagrant-onap/lib/aai
+++ b/bootstrap/vagrant-onap/lib/aai
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
hbase_version=1.2.3
diff --git a/bootstrap/vagrant-onap/lib/appc b/bootstrap/vagrant-onap/lib/appc
index 4d93f54e5..181c73f1f 100755
--- a/bootstrap/vagrant-onap/lib/appc
+++ b/bootstrap/vagrant-onap/lib/appc
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/sdnc
source /var/onap/functions
diff --git a/bootstrap/vagrant-onap/lib/ccsdk b/bootstrap/vagrant-onap/lib/ccsdk
index 03987ea7e..3502e01e8 100755
--- a/bootstrap/vagrant-onap/lib/ccsdk
+++ b/bootstrap/vagrant-onap/lib/ccsdk
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
ccsdk_src_folder=$git_src_folder/ccsdk
diff --git a/bootstrap/vagrant-onap/lib/commons b/bootstrap/vagrant-onap/lib/commons
index 26e2cc26a..ba7c7613a 100755
--- a/bootstrap/vagrant-onap/lib/commons
+++ b/bootstrap/vagrant-onap/lib/commons
@@ -1,26 +1,16 @@
#!/bin/bash
-set -o xtrace
-
# update_repos() - Function that updates linux repositories
function update_repos {
+ echo "Updating repositories list..."
if [ -f /var/onap/files/sources.list ]; then
cp /var/onap/files/sources.list /etc/apt/sources.list
fi
- if [ -f /var/onap/files/proxyrc ]; then
- source /var/onap/files/proxyrc
- cp /var/onap/files/proxyrc /etc/profile.d/proxy.sh
-
- if [ -f /etc/apt/apt.conf ]; then
- echo "Acquire::http::Proxy \"${http_proxy}\";" >> /etc/apt/apt.conf
- echo "Acquire::https::Proxy \"${https_proxy}\";" >> /etc/apt/apt.conf
- fi
- if [ -d /etc/apt/apt.conf.d ] & [ ! -f /etc/apt/apt.conf.d/70proxy.conf ]; then
- echo "Acquire::http::Proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/70proxy.conf
- echo "Acquire::https::Proxy \"${https_proxy}\";" >> /etc/apt/apt.conf.d/70proxy.conf
- fi
+ if [[ "$debug" == "False" ]]; then
+ apt-get update > /dev/null
+ else
+ apt-get update
fi
- apt-get update -qq -y
}
# is_package_installed() - Function to tell if a package is installed
@@ -41,9 +31,15 @@ function install_packages {
# install_package() - Install specific package if doesn't exist
function install_package {
local package=$1
+
if ! is_package_installed $package; then
- update_repos
- apt-get install -y -qq $package
+ echo "Installing $package..."
+
+ if [[ "$debug" == "False" ]]; then
+ apt-get install -y -qq -o=Dpkg::Use-Pty=0 $package
+ else
+ apt-get install -y $package
+ fi
fi
}
diff --git a/bootstrap/vagrant-onap/lib/dcae b/bootstrap/vagrant-onap/lib/dcae
index 78ca8de06..7ab32fd24 100755
--- a/bootstrap/vagrant-onap/lib/dcae
+++ b/bootstrap/vagrant-onap/lib/dcae
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
dcae_src_folder=$git_src_folder/dcae
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions
index 02111fa2c..1a1b2aa4c 100755
--- a/bootstrap/vagrant-onap/lib/functions
+++ b/bootstrap/vagrant-onap/lib/functions
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/commons
source /var/onap/_composed_functions
source /var/onap/_onap_functions
@@ -48,7 +46,11 @@ function clone_repo {
local repo=$1
local dest_folder=${2:-$git_src_folder/$repo}
if [ ! -d $dest_folder ]; then
- _git_timed clone ${repo_url}${repo} $dest_folder
+ if [[ "$debug" == "False" ]]; then
+ _git_timed clone --quiet ${repo_url}${repo} $dest_folder
+ else
+ _git_timed clone ${repo_url}${repo} $dest_folder
+ fi
else
pushd $dest_folder
_git_timed pull
@@ -168,10 +170,10 @@ function install_docker {
fi
install_package software-properties-common
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- add-apt-repository \
+ add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
- $(lsb_release -cs) \
- stable"
+ $(lsb_release -cs) stable"
+
install_package docker-ce
_configure_docker_settings
service docker restart
@@ -225,9 +227,14 @@ function start_ODL {
function compile_src {
local src_folder=$1
pushd $src_folder
+ local mvn_build='mvn clean install -DskipTests=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dadditionalparam=-Xdoclint:none'
+ if [[ "$debug" == "False" ]]; then
+ mvn_build+=" -q"
+ fi
if [ -f pom.xml ]; then
install_maven
- mvn clean install -DskipTests=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dadditionalparam=-Xdoclint:none
+ echo "Compiling $src_folder folder..."
+ eval $mvn_build
fi
popd
}
diff --git a/bootstrap/vagrant-onap/lib/mr b/bootstrap/vagrant-onap/lib/mr
index f221817fa..55096cb4b 100755
--- a/bootstrap/vagrant-onap/lib/mr
+++ b/bootstrap/vagrant-onap/lib/mr
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
mr_src_folder=$git_src_folder/dcae/message-router
diff --git a/bootstrap/vagrant-onap/lib/mso b/bootstrap/vagrant-onap/lib/mso
index 5439d991b..0f29b33c5 100755
--- a/bootstrap/vagrant-onap/lib/mso
+++ b/bootstrap/vagrant-onap/lib/mso
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
src_folder=$git_src_folder/mso
diff --git a/bootstrap/vagrant-onap/lib/multicloud b/bootstrap/vagrant-onap/lib/multicloud
index b4a185aaf..05195877b 100755
--- a/bootstrap/vagrant-onap/lib/multicloud
+++ b/bootstrap/vagrant-onap/lib/multicloud
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
multicloud_src_folder=$git_src_folder/multicloud
diff --git a/bootstrap/vagrant-onap/lib/policy b/bootstrap/vagrant-onap/lib/policy
index be4cb2c18..65a65a186 100755
--- a/bootstrap/vagrant-onap/lib/policy
+++ b/bootstrap/vagrant-onap/lib/policy
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
policy_src_folder=$git_src_folder/policy
diff --git a/bootstrap/vagrant-onap/lib/portal b/bootstrap/vagrant-onap/lib/portal
index b5e768b2c..915ccd59a 100755
--- a/bootstrap/vagrant-onap/lib/portal
+++ b/bootstrap/vagrant-onap/lib/portal
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
portal_src_folder=$git_src_folder/portal
diff --git a/bootstrap/vagrant-onap/lib/robot b/bootstrap/vagrant-onap/lib/robot
index ebcca6e6b..6dcdf90f0 100755
--- a/bootstrap/vagrant-onap/lib/robot
+++ b/bootstrap/vagrant-onap/lib/robot
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
robot_src_folder=$git_src_folder/testsuite
diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc
index a21e2a418..88d1cc0fd 100755
--- a/bootstrap/vagrant-onap/lib/sdc
+++ b/bootstrap/vagrant-onap/lib/sdc
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
sdc_src_folder=$git_src_folder/sdc
diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc
index 5faca942e..a69ce18fb 100755
--- a/bootstrap/vagrant-onap/lib/sdnc
+++ b/bootstrap/vagrant-onap/lib/sdnc
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
source /var/onap/ccsdk
diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc
index fc26af282..a4517ff7c 100755
--- a/bootstrap/vagrant-onap/lib/vfc
+++ b/bootstrap/vagrant-onap/lib/vfc
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
vfc_src_folder=$git_src_folder/vfc
diff --git a/bootstrap/vagrant-onap/lib/vid b/bootstrap/vagrant-onap/lib/vid
index f99fd6042..6fc7f351f 100755
--- a/bootstrap/vagrant-onap/lib/vid
+++ b/bootstrap/vagrant-onap/lib/vid
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
vid_src_folder=$git_src_folder/vid
diff --git a/bootstrap/vagrant-onap/lib/vnfsdk b/bootstrap/vagrant-onap/lib/vnfsdk
index c23ed8581..863bae0f6 100644
--- a/bootstrap/vagrant-onap/lib/vnfsdk
+++ b/bootstrap/vagrant-onap/lib/vnfsdk
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
vnfsdk_src_folder=$git_src_folder/vnfsdk
diff --git a/bootstrap/vagrant-onap/lib/vvp b/bootstrap/vagrant-onap/lib/vvp
index 588f32b87..24264ccc9 100644
--- a/bootstrap/vagrant-onap/lib/vvp
+++ b/bootstrap/vagrant-onap/lib/vvp
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/functions
vvp_src_folder=$git_src_folder/vvp
diff --git a/bootstrap/vagrant-onap/tests/asserts b/bootstrap/vagrant-onap/tests/asserts
index 02c269b4c..52f0bce92 100755
--- a/bootstrap/vagrant-onap/tests/asserts
+++ b/bootstrap/vagrant-onap/tests/asserts
@@ -1,7 +1,5 @@
#!/bin/bash
-set -o xtrace
-
source /var/onap/commons
# asserts_process() - Function that verifies if a specific process is running
diff --git a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
index 89a69dd9a..7083f3d02 100755
--- a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
+++ b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
@@ -1,6 +1,8 @@
#!/bin/bash
-set -o xtrace
+if [[ "$debug" == "True" ]]; then
+ set -o xtrace
+fi
source /var/onap/functions
diff --git a/bootstrap/vagrant-onap/vagrant_utils/unit_testing.sh b/bootstrap/vagrant-onap/vagrant_utils/unit_testing.sh
index a378ad0cd..3a97ad9cf 100755
--- a/bootstrap/vagrant-onap/vagrant_utils/unit_testing.sh
+++ b/bootstrap/vagrant-onap/vagrant_utils/unit_testing.sh
@@ -1,5 +1,9 @@
#!/bin/bash
+if [[ "$debug" == "True" ]]; then
+ set -o xtrace
+fi
+
set -o errexit
TEST_SUITE=${1:-*}