Merge branch 'master' into 'master'

Select automatically CMSSW version for the default scram architecture

See merge request !31

SiteTests/FroNtier/tests/CE-cms-frontier

@@ -22,21 +22,6 @@ fi
 
 tmpfile=`mktemp /tmp/tmp.XXXXXXXXXX`
 
-osVersion=`$SW_DIR/common/cmsos`
-echo "osVersion: " $osVersion
-slVersion=`echo $cmsarch|cut -d'_' -f1`
-if [[ $osVersion == slc6* ]]; then
-    cmsarch=slc6_amd64_gcc530
-elif [[ $osVersion == slc7* ]] ; then
-    cmsarch=slc7_amd64_gcc530
-else
-    echo "ERROR: unknown OS"
-    echo "summary: UNKN_OS"
-    exit $SAME_ERROR
-fi
-echo "scram_arch: " $cmsarch
-export SCRAM_ARCH=$cmsarch
-
 source $SW_DIR/cmsset_default.sh > $tmpfile 2>&1
 result=$?
 export BUILD_ARCH=$SCRAM_ARCH

SiteTests/FroNtier/tests/CMSSW_frontier.sh

@@ -14,7 +14,7 @@ printf "node: $node\n"
 #
 # Choose CMSSW version
 #
-cmsswvsn=CMSSW_9_0_0
+cmsswvsn="`scram l | grep -B 1 "cms.cern.ch" | grep " CMSSW" | tail -1 | awk '{print $2}'`"
 #
 #export SCRAM_ARCH=slc6_amd64_gcc491
 # Check that environmental variable SAME_OK is set