From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 8 Sep 2016 08:19:24 +0000 (+0200)
Subject: Testing RO built against gerrit event
X-Git-Tag: v1.0.0~27^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F289%2F1;p=osm%2Fdevops.git

Testing RO built against gerrit event

Change-Id: I00594250ecfab5c0cec24145a4f63f67cbb239cc
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/jenkins/RO/start_build b/jenkins/RO/start_build
index 9f06cfd2..37cdbdf0 100755
--- a/jenkins/RO/start_build
+++ b/jenkins/RO/start_build
@@ -27,15 +27,23 @@ OSM_load_config
 if [ -d $OSM_MDG ]; then
 	INFO "reusing existing workspace"
 	cd $OSM_MDG
+        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 fetch --all || FATAL "git fetch didn't work"
-	git checkout -f $1 || FATAL "git checkout '$1' didn't work"
+        INFO "Code to compile: gerrit refspec '$1', commit-id: '$2'"
+	FATAL "Testing"
+	#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"
@@ -47,6 +55,7 @@ INFO "starting build"
 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