From a92f574182d88fc1960367d6858bb481c02a7f7b Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Wed, 7 Mar 2018 14:32:42 +0100
Subject: [PATCH] use --ssh option for git-cms tools

---
 run-cmsdist-tests.sh |  2 +-
 run-pr-tests         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/run-cmsdist-tests.sh b/run-cmsdist-tests.sh
index ebbfa37f4d0f..8adb8c2c8063 100755
--- a/run-cmsdist-tests.sh
+++ b/run-cmsdist-tests.sh
@@ -219,7 +219,7 @@ touch $WORKSPACE/cmsswtoolconf.log
 if [ "X${DEP_NAMES}" != "X" ] ; then
   CMSSW_DEP=$(scram build ${DEP_NAMES} | tr ' ' '\n' | grep '^cmssw/\|^self/' | cut -d"/" -f 2,3 | sort | uniq)
   if [ "X${CMSSW_DEP}" != "X" ] ; then
-    git cms-addpkg $CMSSW_DEP 2>&1 | tee -a $WORKSPACE/cmsswtoolconf.log
+    git cms-addpkg --ssh $CMSSW_DEP 2>&1 | tee -a $WORKSPACE/cmsswtoolconf.log
   fi
 fi
 # Launch the standard ru-pr-tests to check CMSSW side passing on the global variables
diff --git a/run-pr-tests b/run-pr-tests
index c0f54cb37106..e3d374861d9e 100755
--- a/run-pr-tests
+++ b/run-pr-tests
@@ -159,12 +159,12 @@ touch $RECENT_COMMITS_FILE
 if [ "X$CMSDIST_ONLY" = Xfalse ]; then # If a CMSSW specific PR was specified
   if [ "X$BRANCH_NAME" = X ]; then
     if [ "${PUB_USER}" = "cms-sw" ]; then
-      (git cms-merge-topic -u $PULL_REQUEST && echo 'ALL_OK') 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
+      (git cms-merge-topic --ssh -u $PULL_REQUEST && echo 'ALL_OK') 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
     else
       (/cvmfs/cms-ib.cern.ch/jenkins-env/git-tools/git-cms-merge-topic -u ${PUB_USER}:${PULL_REQUEST} && echo 'ALL_OK') 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
     fi
   else
-    (git cms-merge-topic -u $BRANCH_NAME && echo 'ALL_OK') 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
+    (git cms-merge-topic --ssh -u $BRANCH_NAME && echo 'ALL_OK') 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
   fi
 
   # this is to test several pull requests at the same time
@@ -172,7 +172,7 @@ if [ "X$CMSDIST_ONLY" = Xfalse ]; then # If a CMSSW specific PR was specified
     echo 'I will add the following pull request to the test'
     echo $PR;
     if [ "${PUB_USER}" = "cms-sw" ]; then
-      git cms-merge-topic -u $PR 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
+      git cms-merge-topic --ssh -u $PR 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
     else
       /cvmfs/cms-ib.cern.ch/jenkins-env/git-tools/git-cms-merge-topic -u ${PUB_USER}:${PR} 2>&1 | tee -a $GIT_MERGE_RESULT_FILE
     fi
@@ -316,7 +316,7 @@ if [ "X$DO_STATIC_CHECKS" = Xtrue -a "$ONLY_FIREWORKS" = false -a "X$CMSDIST_PR"
   echo 'STATIC_CHECKS;OK' >> $RESULTS_FILE
   echo '--------------------------------------'
   pushd $WORKSPACE/$RELEASE_FORMAT
-  git cms-addpkg Utilities/StaticAnalyzers
+  git cms-addpkg --ssh Utilities/StaticAnalyzers
   mkdir $WORKSPACE/llvm-analysis
   SCRAM_IGNORE_PACKAGES="Fireworks/% Utilities/StaticAnalyzers" USER_LLVM_CHECKERS="-enable-checker threadsafety -enable-checker cms -disable-checker cms.FunctionDumper" scram b -k -j $(Jenkins_GetCPU *2) checker SCRAM_IGNORE_SUBDIRS=test 2>&1 | tee -a $WORKSPACE/llvm-analysis/runStaticChecks.log
   cp -R $WORKSPACE/$RELEASE_FORMAT/llvm-analysis/*/* $WORKSPACE/llvm-analysis || true
@@ -340,11 +340,11 @@ if ls $WORKSPACE/$RELEASE_FORMAT/src/| grep -i -E "dqm.*|HLTriggerOffline|Valida
       if ls $WORKSPACE/$RELEASE_FORMAT/src/DQMServices/| grep "Components"; then
         echo "and DQMServices/Components is there"
       else
-        git cms-addpkg DQMServices/Components
+        git cms-addpkg --ssh DQMServices/Components
       fi
   else
     echo "checking out DQMServices"
-    git cms-addpkg DQMServices
+    git cms-addpkg --ssh DQMServices
   fi
 fi
 #############################################