X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fsystem%2Fstart_build;h=1591739ac2a1f10f6643c238e30737acdcf6a6cc;hb=8343e3fc441f1669ae906e85699e3f244dddc0b0;hp=a50a5a8263f6c34fe1ed80124aa7ed26d859253d;hpb=6930bc081efa6feb1a7ff8a9cded75eea807f6f5;p=osm%2Fdevops.git diff --git a/jenkins/system/start_build b/jenkins/system/start_build index a50a5a82..1591739a 100755 --- 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 +. $OSM_JENKINS/common/install_common 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 -# 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 @@ -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_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"