Changeset 19214

Timestamp:

03/20/15 12:39:41 (10 years ago)

Author:

glperez

Message:

CHG: Jenkins script now checks for and uses SVN and SVNVERSION variables.
CHG: Jenkins Murdo script sets SVN and SNVERSION variables.

Location:

issm/trunk-jpl/jenkins

Files:

• jenkins.sh (modified) (3 diffs)
• linux64_murdo (modified) (1 diff)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -34 +34 @@
 #}}}
 
-echo "-------------------------------------"
-echo " SVN: $SVN"
-echo "-------------------------------------"
+#SVN version issue requires that we set SVN and SVNVERSION explicitly in order
+#to remain compatible with the version used by Jenkins to do checkouts
+#{{{
+if [[ -z $SVN ]]; then
+        echo "SVN variable is not set!"
+        echo "Defaulting to SVN found in path..."
+        SVN='svn'
+fi
+if [[ -z $SVNVERSION ]]; then
+        echo "SVNVERSION variable is not set!"
+        echo "Defaulting to SVNVERSION found in path..."
+        SVNVERSION='svnversion'
+fi
+#}}}
 
 #install/copy/none external packages    (ISSM_EXTERNALPACKAGES){{{
@@ -56 +67 @@
                 #this, we check the current svn version against the "last changed" revision number.  If they 
                 #are the same, we reinstall the package. 
-                current_version=`/usr/bin/svnversion`
-                last_changed_version=`/usr/bin/svn info $PACKAGEINST | grep "Last Changed Rev" | awk '{printf("%s\n",$4);}'`
+                current_version=`$SVNVERSION`
+                last_changed_version=`$SVN info $PACKAGEINST | grep "Last Changed Rev" | awk '{printf("%s\n",$4);}'`
 
                 if [[ $current_version == $last_changed_version ]]; then 
@@ -99 +110 @@
                 else
                         echo "======================================================";
-                        echo "       Skipping install of $PACKAGENAME                        ";
+                        echo "       Skipping install of $PACKAGENAME               ";
                         echo "======================================================";
                         source $ISSM_DIR/etc/environment.sh #for good measure :)

issm/trunk-jpl/jenkins/linux64_murdo

@@ -39 +39 @@
 REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
 SVN='/usr/bin/svn'
+SVNVERSION='/usr/bin/svnversion'
 
 #-----------------------------------#