Adding a new paramater to the build scripts to skip building the pvt …

…packages. Also, the pgInstaller9.3 job on Jenkins has been configured to add a new parameter for the same. (Murali)

autobuild.sh

@@ -30,6 +30,7 @@ while [ "$#" -gt "0" ]; do
                 -skipbuild) SKIPBUILD=$2; shift 2;;
                 -platforms) PLATFORMS=$2; shift 2;;
                 -packages) PACKAGES=$2; shift 2;;
+                -skippvtpkg) SKIPPVTPACKAGES=$2; shift 2;;
                 -help|-h) usage;;
                 *) echo -e "error: no such option $1. -h for help"; exit 1;;
         esac
@@ -57,6 +58,14 @@ else
 	SKIPBUILD=""
 fi
 
+# required by build.sh
+if $SKIPPVTPACKAGES ;
+then
+        SKIPPVTPACKAGES="-skippvtpkg"
+else
+        SKIPPVTPACKAGES=""
+fi
+
 _set_config_package()
 {
 	if echo $PACKAGES | grep -w -i $1 > /dev/null
@@ -174,7 +183,7 @@ git pull >> autobuild.log 2>&1
 
 # Run the build, and dump the output to a log file
 echo "Running the build (REL-9_3) " >> autobuild.log
-./build.sh $SKIPBUILD 2>&1 | tee output/build-93.log
+./build.sh $SKIPBUILD $SKIPPVTPACKAGES 2>&1 | tee output/build-93.log
 
 _mail_status "build-93.log" "9.3"
 

build.sh

@@ -16,6 +16,22 @@ then
 fi
 source ./settings.sh
 
+########
+# Usage
+########
+usage()
+{
+        echo "Usage: $0 [Options]\n"
+        echo "    Options:"
+        echo "      [-skipbuild]"
+        echo "      [-skippvtpkg]"
+        echo "    Examples:"
+        echo "     $0 -skipbuild -skippvtpkg"
+        echo "     $0 -skippvtpkg"
+        echo ""
+        exit 1;
+}
+
 ################################################################################
 # Initialise the build system
 ################################################################################
@@ -70,18 +86,29 @@ _check_windows_vm() {
 ################################################################################
 # Rock 'n' roll
 ################################################################################
-if [ $# -ge 1 ];
+while [ "$#" -gt "0" ]; do
+        case "$1" in
+                -skipbuild) SKIPBUILD=$1; shift 1;;              
+                -skippvtpkg) SKIPPVTPACKAGES=$1; shift 1;;
+                -h|-help) usage;;
+                *) echo -e "error: no such option $1. -h for help"; exit 1;;
+        esac
+done
+
+if [ "$SKIPBUILD" = "-skipbuild" ];
 then
-  if [ $1 = "-skipbuild" ];
-  then
-    SKIPBUILD=1
-  else
-    SKIPBUILD=0
-  fi
+  SKIPBUILD=1
 else
   SKIPBUILD=0
 fi
 
+if [ $SKIPPVTPACKAGES = "-skippvtpkg" ];
+then
+  SKIPPVTPACKAGES=1
+else
+  SKIPPVTPACKAGES=0
+fi
+
 # Check the VMs
 if [ $PG_ARCH_LINUX = 1 ];
 then
@@ -355,8 +382,10 @@ then
 fi
 
 # Check for private builds
-if [ -e $WD/pvt_build.sh ];
+if [ $SKIPPVTPACKAGES = 0 ];
 then
-    source $WD/pvt_build.sh
+    if [ -e $WD/pvt_build.sh ];
+    then
+        source $WD/pvt_build.sh
+    fi
 fi
-