Make stability test optional.

To allow building a dist for the community build in under 20 mins.

1 files changed, 15 insertions, 3 deletions

diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
index 30bcf01b6a..5340bda0e1 100755
--- a/scripts/jobs/integrate/bootstrap
+++ b/scripts/jobs/integrate/bootstrap
@@ -91,6 +91,8 @@ publishSonatypeTaskModules=${publishSonatypeTaskModules-"publishSigned"}
 forceRebuild=${forceRebuild-no}
 
 sbtBuildTask=${sbtBuildTask-"testAll"} # TESTING leave empty to avoid the sanity check
+testStability=${testStability-yes}
+
 clean="clean" # TESTING leave empty to speed up testing
 
 baseDir=${WORKSPACE-`pwd`}
@@ -529,6 +531,15 @@ bootstrap() {
   # clear ivy cache (and to be sure, local as well), so the next round of sbt builds sees the fresh scala
   rm -rf $baseDir/ivy2
 
+  # TODO: create PR with following commit (note that release will have been tagged already)
+  # git commit versions.properties -m"Bump versions.properties for $SCALA_VER."
+}
+
+testStability() {
+  echo "### Testing stability"
+
+  cd $baseDir
+
   # Run stability tests using the just built version as "quick" and a new version as "strap"
   mv build/quick quick1
   rm -rf build/
@@ -542,9 +553,6 @@ bootstrap() {
   mv build/quick build/strap
   mv quick1 build/quick
   $scriptsDir/stability-test.sh
-
-  # TODO: create PR with following commit (note that release will have been tagged already)
-  # git commit versions.properties -m"Bump versions.properties for $SCALA_VER."
 }
 
 # assumes we just bootstrapped, and current directory is $baseDir
@@ -591,6 +599,10 @@ removeExistingBuilds
 
 bootstrap
 
+if [ "$testStability" == "yes" ]
+  then testStability
+fi
+
 if [ "$publishToSonatype" == "yes" ]
   then publishSonatype
 fi