X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=787164984bfe8eb0ef7014cc24abdbd41c8ae9e2;hb=refs%2Fchanges%2F30%2F8230%2F1;hp=7b45761a1467a9984c681c9ae9e443bf6048bb57;hpb=a7e5d0103241459c2aae06c53931bebed13b4cec;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 7b45761a..78716498 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -720,7 +720,7 @@ function generate_docker_images() { elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q RO ; then git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/RO git -C ${LWTEMPDIR}/RO checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/RO -f ${LWTEMPDIR}/RO/docker/Dockerfile-local -t ${DOCKER_USER}/ro --no-cache" || FATAL "cannot build RO docker image" + sg docker -c "docker build ${LWTEMPDIR}/RO -f ${LWTEMPDIR}/RO/Dockerfile-local -t ${DOCKER_USER}/ro --no-cache" || FATAL "cannot build RO docker image" fi if [ -n "$PULL_IMAGES" ]; then @@ -1415,8 +1415,7 @@ if [ -z "$OSM_DEVOPS" ]; then fi fi -OSM_JENKINS="$OSM_DEVOPS/jenkins" -. $OSM_JENKINS/common/all_funcs +. $OSM_DEVOPS/common/all_funcs [ -n "$INSTALL_LIGHTWEIGHT" ] && [ -n "$UNINSTALL" ] && uninstall_lightweight && echo -e "\nDONE" && exit 0 [ -n "$UNINSTALL" ] && uninstall && echo -e "\nDONE" && exit 0