From d27c35f72f5eadb2a05182fc2b9e69ae5885c060 Mon Sep 17 00:00:00 2001
From: Graeme Stewart <graemes.cern@gmail.com>
Date: Tue, 7 Feb 2017 16:34:32 +0100
Subject: [PATCH] Improved master branch build setup

Modify checkout_atlasexternals.sh to use a default clone URL
which is https+krb5. Also allow this to be changed with a
command line switch. N.B. Still requires support from the
higher level script Projects/Athena/build_externals.sh.

Change the Athena project package build list. Remove
analysis only packages that should not build here. Also filter
out many generator packages for now until these can be fixed
properly. Lack of generators disables fast simulation.
---
 .../checkout_atlasexternals.sh                | 12 +++--
 Projects/Athena/package_filters.txt           | 49 +++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/Build/AtlasBuildScripts/checkout_atlasexternals.sh b/Build/AtlasBuildScripts/checkout_atlasexternals.sh
index 93c068d7cb1..edbe891d820 100755
--- a/Build/AtlasBuildScripts/checkout_atlasexternals.sh
+++ b/Build/AtlasBuildScripts/checkout_atlasexternals.sh
@@ -14,14 +14,16 @@ set -e
 # Function printing the usage information for the script
 usage() {
     echo "Usage: checkout_atlasexternals.sh <-t branch/tag> " \
-        "<-s source directory> [-o hash_file.txt]"
+        "<-s source directory> <-e atlas externals repo url> " \
+	"[-o hash_file.txt]"
 }
 
 # Parse the command line arguments:
 TAGBRANCH=""
 SOURCEDIR=""
 HASHFILE=""
-while getopts ":t:o:s:h" opt; do
+EXTERNALSURL="https://:@gitlab.cern.ch:8443/atlas/atlasexternals.git"
+while getopts ":t:o:s:h:e" opt; do
     case $opt in
         t)
             TAGBRANCH=$OPTARG
@@ -32,6 +34,9 @@ while getopts ":t:o:s:h" opt; do
         o)
             HASHFILE=$OPTARG
             ;;
+	e)
+	    EXTERNALSURL=$OPTARG
+	    ;;
         h)
             usage
             exit 0
@@ -63,8 +68,7 @@ if [ "$HASHFILE" != "" ]; then
 fi
 
 # Clone the repository:
-git clone ssh://git@gitlab.cern.ch:7999/atlas/atlasexternals.git \
-    ${SOURCEDIR}
+git clone ${EXTERNALSURL} ${SOURCEDIR}
 
 # Get the appropriate tag of it:
 cd ${SOURCEDIR}
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index 55da4f6938e..7320835bc50 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -18,3 +18,52 @@
 # Offload service has build problems
 -External/APEGlue
 -Offloading
+
+# Temporarily don't build generators (except for a key infrastructure packages)
+# Lack of generators also disables fast simulation
++Generators/GenAnalysisTools
++Generators/GeneratorObjects
++Generators/GeneratorObjectsTPCnv
++Generators/TruthUtils
++Generators/HepMCWeightSvc
++Generators/HforTool
++Generators/GenzModuleEvent
+-Generators
+-Simulation/FastSimulation
+-Simulation/ISF/ISF_Fatras
+-Simulation/ISF/ISF_FastCaloSim
+-Simulation/G4Extensions/G4ExternalDecay
+-Simulation/G4Extensions/RHadrons
+-Simulation/FastShower
+-InnerDetector/InDetDigitization/FastSiDigitization
+
+# Temporary VP1 compilation issues
+-graphics/VP1
+
+# Some analysis packages that are not part of Athena
++PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
+
+-AsgExternal/Asg_Test
+-PhysicsAnalysis/D3PDTools/EventLoop
+-PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples
+-PhysicsAnalysis/AnalysisCommon/PMGTools
+-PhysicsAnalysis/D3PDTools/EventLoop
+-PhysicsAnalysis/D3PDTools/EventLoopAlgs
+-PhysicsAnalysis/D3PDTools/EventLoopGrid
+-PhysicsAnalysis/D3PDTools/MultiDraw
+-PhysicsAnalysis/D3PDTools/SampleHandler
+-PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection
+-PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection
+-PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
+-PhysicsAnalysis/JetPhys/SemileptonicCorr
+-PhysicsAnalysis/SUSYPhys/SUSYTools
+-PhysicsAnalysis/TauID/DiTauMassTools
+-PhysicsAnalysis/TauID/TauCorrUncert
+-PhysicsAnalysis/TopPhys/QuickAna
+-PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools
+-Reconstruction/Jet/JetAnalysisTools/JetTileCorrection
+-Reconstruction/Jet/JetJvtEfficiency
+-Reconstruction/Jet/JetReclustering
+-Reconstruction/Jet/JetAnalysisTools/JetTileCorrection
+-Trigger/TrigAnalysis/TrigMuonEfficiency
+-Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching
-- 
GitLab