projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.0'
[osm/devops.git]
/
jenkins
/
system
/
start_build
diff --git
a/jenkins/system/start_build
b/jenkins/system/start_build
index
a50a5a8
..
1591739
100755
(executable)
--- a/
jenkins/system/start_build
+++ b/
jenkins/system/start_build
@@
-19,6
+19,7
@@
HERE=$(realpath $(dirname $0))
OSM_JENKINS=$(dirname $HERE)
. $OSM_JENKINS/common/all_funcs
HERE=$(realpath $(dirname $0))
OSM_JENKINS=$(dirname $HERE)
. $OSM_JENKINS/common/all_funcs
+. $OSM_JENKINS/common/install_common
INFO "Installing packages"
apt-get update
INFO "Installing packages"
apt-get update
@@
-53,11
+54,10
@@
systemctl start lxd-bridge
apt-get install -y python-pip python python-pycurl charm-tools python-pytest
apt-get install -y python-pip python python-pycurl charm-tools python-pytest
-# TODO: use package when available on osm repo
-git clone https://osm.etsi.org/gerrit/osm/osmclient
-pip install osmclient/.
+apt install -y python-osmclient
-devops/installers/install_osm.sh $*
+export OSM_USE_LOCAL_DEVOPS=true
+devops/installers/install_osm.sh --test $*
RC=$?
# workaround. for upload packages, lxdbr0 needs to be promiscuous
RC=$?
# workaround. for upload packages, lxdbr0 needs to be promiscuous
@@
-71,6
+71,8
@@
if [ $RC == 0 ]; then
TO_ADD="export OSM_HOSTNAME=$SO_CONTAINER_IP"
grep -q OSM_HOSTNAME ~/.bashrc && sed -i "s/.*OSM_HOSTNAME.*/$TO_ADD/" ~/.bashrc || echo -e "$TO_ADD\n$(cat ~/.bashrc)" > ~/.bashrc
TO_ADD="export OSM_HOSTNAME=$SO_CONTAINER_IP"
grep -q OSM_HOSTNAME ~/.bashrc && sed -i "s/.*OSM_HOSTNAME.*/$TO_ADD/" ~/.bashrc || echo -e "$TO_ADD\n$(cat ~/.bashrc)" > ~/.bashrc
+ TO_ADD="export OSM_RO_HOSTNAME=$RO_CONTAINER_IP"
+ grep -q OSM_RO_HOSTNAME ~/.bashrc && sed -i "s/.*OSM_RO_HOSTNAME.*/$TO_ADD/" ~/.bashrc || echo -e "$TO_ADD\n$(cat ~/.bashrc)" > ~/.bashrc
fi
INFO "done, RC=$RC"
fi
INFO "done, RC=$RC"