Add secret-management in Charmed OSM

[osm/devops.git] / jenkins / system / start_build

diff --git a/jenkins/system/start_build b/jenkins/system/start_build
index 7f259c7..328aa87 100755 (executable)
--- a/jenkins/system/start_build
+++ b/jenkins/system/start_build
@@ -19,9 +19,11 @@
 HERE=$(realpath $(dirname $0))
 OSM_JENKINS=$(dirname $HERE)
 . $OSM_JENKINS/common/all_funcs
+. $OSM_JENKINS/common/install_common
 
 INFO "Installing packages"
 apt-get update
+apt-get install -y lxd
 
 INFO "Configuring LXD"
 # ZFS doesn't work inside a nested container. ZFS should be configured in the host LXD.
@@ -51,14 +53,15 @@ EOF
 systemctl enable lxd-bridge
 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 python-openstackclient
 
-# TODO: use package when available on osm repo
-git clone https://osm.etsi.org/gerrit/osm/osmclient
-pip install osmclient/.
+apt-get install -y python-osmclient
 
 export OSM_USE_LOCAL_DEVOPS=true
-devops/installers/install_osm.sh --test $*
+echo "devops/installers/full_install_osm.sh --test --soui $*"
+devops/installers/full_install_osm.sh --test --soui $*
+#echo "devops/installers/full_install_osm.sh --test $*"
+#devops/installers/full_install_osm.sh --test $*
 RC=$?
 
 # workaround.  for upload packages, lxdbr0 needs to be promiscuous
@@ -72,6 +75,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_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"