Skip to content

Commit 3390b89

Browse files
LinaresToineAntonio Linares
LinaresToine
and
Antonio Linares
authored
update deployment scripts (#5173)
Co-authored-by: Antonio Linares <a.linares@cern.ch>
1 parent ec72488 commit 3390b89

File tree

4 files changed

+87
-26
lines changed

4 files changed

+87
-26
lines changed

‎bin/00_pypi_deploy_prod.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ then
3030
exit
3131
fi
3232

33-
WMAGENT_TAG=2.4.2
34-
TIER0_VERSION=3.5.1
33+
WMAGENT_TAG=2.4.5
34+
TIER0_VERSION=3.5.4
3535
COUCH_TAG=3.2.2
3636

3737
BASE_DIR=/data/tier0

‎bin/00_pypi_deploy_replay.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ then
1515
exit
1616
fi
1717

18-
WMAGENT_TAG=2.4.2rc7
19-
TIER0_VERSION=3.5.1
18+
WMAGENT_TAG=2.4.5
19+
TIER0_VERSION=3.5.4
2020
COUCH_TAG=3.2.2
2121

2222
BASE_DIR=/data/tier0

‎bin/00_pypi_patches.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ DEPLOY_DIR=$BASE_DIR/WMAgent.venv3
2121
#curl https://patch-diff.githubusercontent.com/raw/dmwm/T0/pull/5041.patch | patch -f -d $WMA_DEPLOY_DIR/lib/python3.12/site-packages/ -p 3
2222

2323
#Automatic Scenarios
24-
curl https://patch-diff.githubusercontent.com/raw/dmwm/T0/pull/5112.patch | patch -f -d $WMA_DEPLOY_DIR/lib/python3.12/site-packages/ -p 3
24+
#curl https://patch-diff.githubusercontent.com/raw/dmwm/T0/pull/5112.patch | patch -f -d $WMA_DEPLOY_DIR/lib/python3.12/site-packages/ -p 3
2525

26+
# RetryManager bug fix
27+
curl https://patch-diff.githubusercontent.com/raw/Viphava280444/WMCore/pull/1.patch | patch -f -d $WMA_DEPLOY_DIR/lib/python3.12/site-packages/ -p 3
2628

2729
######################
2830
### WMCore patches ###

‎bin/00_pypi_resource_control.sh‎

Lines changed: 80 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,89 @@
11
#!/bin/bash
22

33
#Settings for using T0_CH_CERN_Disk
4-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --cms-name=T2_CH_CERN --pnn=T0_CH_CERN_Disk --ce-name=T2_CH_CERN --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
5-
manage execute-agent wmagent-resource-control --site-name=T0_CH_CERN_Disk --cms-name=T0_CH_CERN_Disk --pnn=T2_CH_CERN --ce-name=T0_CH_CERN_Disk --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
6-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Processing --pending-slots=10000 --running-slots=10000
4+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --cms-name=T2_CH_CERN --pnn=T0_CH_CERN_Disk --ce-name=T2_CH_CERN --pending-slots=25000 --running-slots=52000 --plugin=SimpleCondorPlugin
5+
manage execute-agent wmagent-resource-control --site-name=T0_CH_CERN_Disk --cms-name=T0_CH_CERN_Disk --pnn=T2_CH_CERN --ce-name=T0_CH_CERN_Disk --pending-slots=25000 --running-slots=52000 --plugin=SimpleCondorPlugin
6+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Processing --pending-slots=10000 --running-slots=25000
77
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Merge --pending-slots=1000 --running-slots=1000
88
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Cleanup --pending-slots=1000 --running-slots=1000
99
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=LogCollect --pending-slots=1000 --running-slots=1000
1010
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Skim --pending-slots=1 --running-slots=1
1111
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Production --pending-slots=1 --running-slots=1
1212
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Harvesting --pending-slots=1000 --running-slots=1000
13-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Express --pending-slots=3000 --running-slots=3000
14-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Repack --pending-slots=5000 --running-slots=5000
15-
16-
#Settings for using T2_CH_CERN_P5 (PromptReco)
17-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --cms-name=T2_CH_CERN_P5 --pnn=T2_CH_CERN_P5 --ce-name=T2_CH_CERN_P5 --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
18-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Processing --pending-slots=10000 --running-slots=10000
19-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Merge --pending-slots=1000 --running-slots=1000
20-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Cleanup --pending-slots=1000 --running-slots=1000
21-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=LogCollect --pending-slots=1000 --running-slots=1000
22-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Skim --pending-slots=1 --running-slots=1
23-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Production --pending-slots=1 --running-slots=1
24-
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Harvesting --pending-slots=1000 --running-slots=1000
25-
26-
#t0 --resource-control=T1_ES_PIC
27-
#t0 --resource-control=T1_I_CNAF
28-
#t0 --resource-control=T1_DE_KIT
29-
#t0 --resource-control=T1_UK_RAL
30-
#t0 --resource-control=T1_FR_CCIN2P3
13+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Express --pending-slots=4000 --running-slots=8000
14+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Repack --pending-slots=7000 --running-slots=15000
15+
16+
# Settings for using T2_CH_CERN_P5 and T1 sites (PromptReco)
17+
# Values set to 0 because we want to control job submission amount
18+
# Jobs are then set to run at the sites with condor commands and cronjobs
19+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --cms-name=T2_CH_CERN_P5 --pnn=T2_CH_CERN_P5 --ce-name=T2_CH_CERN_P5 --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
20+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Processing --pending-slots=0 --running-slots=0
21+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Merge --pending-slots=0 --running-slots=0
22+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Cleanup --pending-slots=0 --running-slots=0
23+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=LogCollect --pending-slots=0 --running-slots=0
24+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Skim --pending-slots=0 --running-slots=0
25+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Production --pending-slots=0 --running-slots=0
26+
manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Harvesting --pending-slots=0 --running-slots=0
27+
28+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --cms-name=T1_DE_KIT --pnn=T1_DE_KIT --ce-name=T1_DE_KIT --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
29+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --task-type=Processing --pending-slots=0 --running-slots=0
30+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --task-type=Merge --pending-slots=0 --running-slots=0
31+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --task-type=Cleanup --pending-slots=0 --running-slots=0
32+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --task-type=LogCollect --pending-slots=0 --running-slots=0
33+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --task-type=Skim --pending-slots=0 --running-slots=0
34+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --task-type=Production --pending-slots=0 --running-slots=0
35+
manage execute-agent wmagent-resource-control --site-name=T1_DE_KIT --task-type=Harvesting --pending-slots=0 --running-slots=0
36+
37+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --cms-name=T1_UK_RAL --pnn=T1_UK_RAL --ce-name=T1_UK_RAL --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
38+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --task-type=Processing --pending-slots=0 --running-slots=0
39+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --task-type=Merge --pending-slots=0 --running-slots=0
40+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --task-type=Cleanup --pending-slots=0 --running-slots=0
41+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --task-type=LogCollect --pending-slots=0 --running-slots=0
42+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --task-type=Skim --pending-slots=0 --running-slots=0
43+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --task-type=Production --pending-slots=0 --running-slots=0
44+
manage execute-agent wmagent-resource-control --site-name=T1_UK_RAL --task-type=Harvesting --pending-slots=0 --running-slots=0
45+
46+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --cms-name=T1_FR_CCIN2P3 --pnn=T1_FR_CCIN2P3 --ce-name=T1_FR_CCIN2P3 --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
47+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --task-type=Processing --pending-slots=0 --running-slots=0
48+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --task-type=Merge --pending-slots=0 --running-slots=0
49+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --task-type=Cleanup --pending-slots=0 --running-slots=0
50+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --task-type=LogCollect --pending-slots=0 --running-slots=0
51+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --task-type=Skim --pending-slots=0 --running-slots=0
52+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --task-type=Production --pending-slots=0 --running-slots=0
53+
manage execute-agent wmagent-resource-control --site-name=T1_FR_CCIN2P3 --task-type=Harvesting --pending-slots=0 --running-slots=0
54+
55+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --cms-name=T1_US_FNAL --pnn=T1_US_FNAL --ce-name=T1_US_FNAL --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
56+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --task-type=Processing --pending-slots=0 --running-slots=0
57+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --task-type=Merge --pending-slots=0 --running-slots=0
58+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --task-type=Cleanup --pending-slots=0 --running-slots=0
59+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --task-type=LogCollect --pending-slots=0 --running-slots=0
60+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --task-type=Skim --pending-slots=0 --running-slots=0
61+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --task-type=Production --pending-slots=0 --running-slots=0
62+
manage execute-agent wmagent-resource-control --site-name=T1_US_FNAL --task-type=Harvesting --pending-slots=0 --running-slots=0
63+
64+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --cms-name=T1_ES_PIC --pnn=T1_ES_PIC --ce-name=T1_ES_PIC --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
65+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --task-type=Processing --pending-slots=0 --running-slots=0
66+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --task-type=Merge --pending-slots=0 --running-slots=0
67+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --task-type=Cleanup --pending-slots=0 --running-slots=0
68+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --task-type=LogCollect --pending-slots=0 --running-slots=0
69+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --task-type=Skim --pending-slots=0 --running-slots=0
70+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --task-type=Production --pending-slots=0 --running-slots=0
71+
manage execute-agent wmagent-resource-control --site-name=T1_ES_PIC --task-type=Harvesting --pending-slots=0 --running-slots=0
72+
73+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --cms-name=T1_IT_CNAF --pnn=T1_IT_CNAF --ce-name=T1_IT_CNAF --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
74+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --task-type=Processing --pending-slots=0 --running-slots=0
75+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --task-type=Merge --pending-slots=0 --running-slots=0
76+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --task-type=Cleanup --pending-slots=0 --running-slots=0
77+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --task-type=LogCollect --pending-slots=0 --running-slots=0
78+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --task-type=Skim --pending-slots=0 --running-slots=0
79+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --task-type=Production --pending-slots=0 --running-slots=0
80+
manage execute-agent wmagent-resource-control --site-name=T1_IT_CNAF --task-type=Harvesting --pending-slots=0 --running-slots=0
81+
82+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --cms-name=T1_RU_JINR --pnn=T1_RU_JINR --ce-name=T1_RU_JINR --pending-slots=0 --running-slots=0 --plugin=SimpleCondorPlugin
83+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --task-type=Processing --pending-slots=0 --running-slots=0
84+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --task-type=Merge --pending-slots=0 --running-slots=0
85+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --task-type=Cleanup --pending-slots=0 --running-slots=0
86+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --task-type=LogCollect --pending-slots=0 --running-slots=0
87+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --task-type=Skim --pending-slots=0 --running-slots=0
88+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --task-type=Production --pending-slots=0 --running-slots=0
89+
manage execute-agent wmagent-resource-control --site-name=T1_RU_JINR --task-type=Harvesting --pending-slots=0 --running-slots=0

0 commit comments

Comments
 (0)