Make compatible with new jenkins jobs

Author: adriaanm

scripts/jobs/scala-release-2.11.x-build

@@ -381,7 +381,7 @@ determineScalaVersion() {
 
       # TODO: publish nightly snapshot using this script
       publishToSonatype="no"
-      echo "dist_ref=2.11.x" >> $baseDir/jenkins.properties # for the -dist downstream jobs that build the actual archives
+      echo "repo_ref=2.11.x" >> $baseDir/jenkins.properties # for the -dist downstream jobs that build the actual archives
     else
       echo "HEAD is tagged as $scalaTag."
       # borrowed from https://github.com/cloudflare/semver_bash/blob/master/semver.sh
@@ -552,8 +552,7 @@ bootstrap() {
   # don't skip locker (-Dlocker.skip=1), or stability will fail
   # overwrite "locker" version of scala at private-repo with bootstrapped version
   cd $baseDir
-  rm -rf build/
-  git clean -fx # don't clean out the whole workspace, we need to keep the logs dirs etc
+  rm -rf build/ # must leave everything else in $baseDir for downstream jobs
 
   ant -Dstarr.version=$SCALA_VER\
       -Dextra.repo.url=$privateRepo\