switch SO and UI from fedora to Ubuntu

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

diff --git a/jenkins/RO/start_build b/jenkins/RO/start_build
index b633679..7ae8d24 100755 (executable)
--- a/jenkins/RO/start_build
+++ b/jenkins/RO/start_build
@@ -27,25 +27,30 @@ OSM_load_config
 if [ -d $OSM_MDG ]; then
        INFO "reusing existing workspace"
        cd $OSM_MDG
-       git pull 
+        git checkout master  #to make sure that we are in the right branch before pulling the code
+       git pull
+        # TO DO: probably it makes sense to fetch all branches, but this requires creating the branches locally
 else
        INFO "cloning MDG $OSM_MDG from $OSM_GIT_URL/$OSM_MDG"
        git clone $OSM_GIT_URL/$OSM_MDG
        cd $OSM_MDG
 fi
+
 if [ $# -gt 0 ]; then
-       git checkout $1
+        INFO "Code to compile: gerrit refspec '$1', commit-id: '$2'"
+       git fetch origin $1 || FATAL "git fetch origin '$1' didn't work"
+       git checkout -f $2 || FATAL "git checkout -f '$2' didn't work"
+else
+        INFO "Code to compile: master"
+       git checkout master
 fi
 
 INFO "starting build"
 
-### for start_build
-### put your commands here to
-### build, test and produce coverage reports
-
 rm *.pyc
 python -m py_compile *.py
 RC=$?
+git checkout master #Cleaning the environment. It's also done at the beginning, but it's done just in case.
 
 INFO "done, RC=$RC"
 exit $RC