From d5631eb95433a0e009c0eb0e10c1d377edf4926c Mon Sep 17 00:00:00 2001
From: Fabio Monti <fabio.monti@cern.ch>
Date: Sun, 9 May 2021 22:04:15 +0000
Subject: [PATCH 1/2] Test one ecalelf production - work ongoing

---
 Jenkinsfile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index d2b2ab7..3603703 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,6 +37,28 @@ pipeline {
                 }
             }
         }
+        stage('Create jobs') {
+            steps {
+                sh """
+                    pwd
+                    cd $CMSSW_BASE/src/Calibration/EcalAlCaRecoProducers/
+                    ################
+                    #temp hack to not submit jobs but still comunicate with the database
+                    sed -i "s/condor_submit/#condor_submin/g"   $CMSSW_BASE/src/Tools/LSFsubmit/scripts/submit
+                    ################ 
+                    ./scripts/prodNtuples.sh --type=MINIAOD -t config/reRecoTags/106X_MCRun2_UL16_Pre.py -s noSkim --isMC --scheduler=caf --extraName=UL2016_testJenkins1 -r allRange -d /DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer19UL16MiniAODAPV-106X_mcRun2_asymptotic_preVFP_v8-v1/MINIAODSIM -n DYJets_M50-CP5-amcatnlo-Run2016UL-MC-PreVFP --store caf --remote_dir database VALID Run2016UL_SS_PreVFP, --doEleIDTree   --EcalAutomation
+                """
+            }
+        }
+        stage('Test job') {
+            steps {
+                sh """
+                    pwd
+                    cd $CMSSW_BASE/src/Calibration/EcalAlCaRecoProducers/
+                    ./prod_ntuples/MINIAODNTUPLE/106X_MCRun2_UL16_Pre/DYJets_M50-CP5-amcatnlo-Run2016UL-MC-PreVFP/allRange//UL2016_testJenkins1/share/run.sh 5 proxy???
+                """
+            }
+        }
         stage('Wrap up') {
             steps {
                 updateGitlabCommitStatus name: 'build', state: 'success'
-- 
GitLab


From b1b034a78ec32a6815288919f48c0e4dd2c4739a Mon Sep 17 00:00:00 2001
From: Fabio Monti <fabio.monti@cern.ch>
Date: Mon, 10 May 2021 14:23:16 +0000
Subject: [PATCH 2/2] Update Jenkinsfile - test1

---
 Jenkinsfile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3603703..3d0c3cb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,12 +9,18 @@ def generateStage(id, dset) {
         stage("stage: ${id}") {
             node("lxplus") {
                 sh script: """
+                  export X509_USER_PROXY=$HOME/grid_proxy.x509
                   scram project ${CMSSW_RELEASE}
                   cd ${CMSSW_RELEASE}/src
                   eval `scramv1 runtime -sh`
                   git clone -b EcalAutomation https://gitlab.cern.ch/fmonti/ECALELF.git Calibration
                   git clone -b EcalAutomation https://github.com/fabio-mon/LSFsubmit.git Tools/LSFsubmit/scripts
+                  ################
+                  # temp hack to not submit jobs but still comunicate with the database (if --EcalAutomation is set)
+                  sed -i "s/condor_submit/#condor_submit/g"   ${CMSSW_RELEASE}/src/Tools/LSFsubmit/scripts/submit
+                  ################ 
                   scram b -j
+                  source ${CMSSW_RELEASE}/Calibration/initCmsEnv.sh
                   cd -
                   echo "${dset}"
                   """
@@ -42,11 +48,8 @@ pipeline {
                 sh """
                     pwd
                     cd $CMSSW_BASE/src/Calibration/EcalAlCaRecoProducers/
-                    ################
-                    #temp hack to not submit jobs but still comunicate with the database
-                    sed -i "s/condor_submit/#condor_submin/g"   $CMSSW_BASE/src/Tools/LSFsubmit/scripts/submit
-                    ################ 
-                    ./scripts/prodNtuples.sh --type=MINIAOD -t config/reRecoTags/106X_MCRun2_UL16_Pre.py -s noSkim --isMC --scheduler=caf --extraName=UL2016_testJenkins1 -r allRange -d /DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer19UL16MiniAODAPV-106X_mcRun2_asymptotic_preVFP_v8-v1/MINIAODSIM -n DYJets_M50-CP5-amcatnlo-Run2016UL-MC-PreVFP --store caf --remote_dir database VALID Run2016UL_SS_PreVFP, --doEleIDTree   --EcalAutomation
+
+                    ./scripts/prodNtuples.sh --type=MINIAOD -t config/reRecoTags/106X_MCRun2_UL16_Pre.py -s noSkim --isMC --scheduler=caf --extraName=UL2016_testJenkins1 -r allRange -d /DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer19UL16MiniAODAPV-106X_mcRun2_asymptotic_preVFP_v8-v1/MINIAODSIM -n DYJets_M50-CP5-amcatnlo-Run2016UL-MC-PreVFP --store caf --remote_dir database VALID Run2016UL_SS_PreVFP, --doEleIDTree --ntuple_remote_dir group/dpg_ecal/alca_ecalcalib/ecalelf/ntuples/fmonti/ # --EcalAutomation
                 """
             }
         }
@@ -54,8 +57,8 @@ pipeline {
             steps {
                 sh """
                     pwd
-                    cd $CMSSW_BASE/src/Calibration/EcalAlCaRecoProducers/
-                    ./prod_ntuples/MINIAODNTUPLE/106X_MCRun2_UL16_Pre/DYJets_M50-CP5-amcatnlo-Run2016UL-MC-PreVFP/allRange//UL2016_testJenkins1/share/run.sh 5 proxy???
+                    cd ${CMSSW_RELEASE}/src/Calibration/EcalAlCaRecoProducers/
+                    ./prod_ntuples/MINIAODNTUPLE/106X_MCRun2_UL16_Pre/DYJets_M50-CP5-amcatnlo-Run2016UL-MC-PreVFP/allRange//UL2016_testJenkins1/share/run.sh 5 $X509_USER_PROXY
                 """
             }
         }
-- 
GitLab