From 6e4750beb28107cf75329323cd96e6f914e26628 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Thu, 16 May 2024 17:17:04 +0200 Subject: [PATCH 1/3] Add tweak for WorkQueueManager --- docker/pypi/wmagent/init.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docker/pypi/wmagent/init.sh b/docker/pypi/wmagent/init.sh index c05abebe9..aa37f0e51 100755 --- a/docker/pypi/wmagent/init.sh +++ b/docker/pypi/wmagent/init.sh @@ -176,8 +176,14 @@ deploy_to_host(){ [[ -d $WMA_CONFIG_DIR/etc ]] || mkdir -p $WMA_CONFIG_DIR/etc cp -f $WMA_DEPLOY_DIR/etc/rucio.cfg $WMA_CONFIG_DIR/etc/ # update the rucio.cfg file with the proper parameters from the secrets file - sed -i "s+RUCIO_HOST_OVERWRITE+$RUCIO_HOST+" $WMA_CONFIG_DIR/etc/rucio.cfg - sed -i "s+RUCIO_AUTH_OVERWRITE+$RUCIO_AUTH+" $WMA_CONFIG_DIR/etc/rucio.cfg + local rucio_host=$RUCIO_HOST + local rucio_auth=$RUCIO_AUTH + if [[ "$TEAMNAME" == *testbed* ]] || [[ "$TEAMNAME" == *dev* ]]; then + rucio_host=http://cms-rucio.cern.ch + rucio_auth=https://cms-rucio-auth.cern.ch + fi + sed -i "s+RUCIO_HOST_OVERWRITE+$rucio_host+" $WMA_CONFIG_DIR/etc/rucio.cfg + sed -i "s+RUCIO_AUTH_OVERWRITE+$rucio_auth+" $WMA_CONFIG_DIR/etc/rucio.cfg echo $WMA_BUILD_ID > $wmaInitRucio } @@ -415,6 +421,10 @@ agent_tweakconfig() { GLOBAL_DBS_URL=https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader sed -i "s+DBSInterface.globalDBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.globalDBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py sed -i "s+DBSInterface.DBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.DBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py + rucio_host=http://cms-rucio.cern.ch + rucio_auth=https://cms-rucio-auth.cern.ch + sed -i "s+WorkQueueManager.rucioUrl =.*+WorkQueueManager.rucioUrl+WorkQueueManager.rucioUrl = $rucio_host'+" $WMA_CONFIG_DIR/config.py + sed -i "s+WorkQueueManager.rucioAuthUrl =.*+WorkQueueManager.rucioUrl+WorkQueueManager.rucioAuthUrl = $rucio_auth'+" $WMA_CONFIG_DIR/config.py fi local forceSiteDown="" From 085eabeba47fc29c0f3688a8a32a5ebde036cf67 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Thu, 16 May 2024 21:17:20 +0200 Subject: [PATCH 2/3] Typo --- docker/pypi/wmagent/init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/pypi/wmagent/init.sh b/docker/pypi/wmagent/init.sh index aa37f0e51..103d8c12c 100755 --- a/docker/pypi/wmagent/init.sh +++ b/docker/pypi/wmagent/init.sh @@ -423,8 +423,8 @@ agent_tweakconfig() { sed -i "s+DBSInterface.DBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.DBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py rucio_host=http://cms-rucio.cern.ch rucio_auth=https://cms-rucio-auth.cern.ch - sed -i "s+WorkQueueManager.rucioUrl =.*+WorkQueueManager.rucioUrl+WorkQueueManager.rucioUrl = $rucio_host'+" $WMA_CONFIG_DIR/config.py - sed -i "s+WorkQueueManager.rucioAuthUrl =.*+WorkQueueManager.rucioUrl+WorkQueueManager.rucioAuthUrl = $rucio_auth'+" $WMA_CONFIG_DIR/config.py + sed -i "s+WorkQueueManager.rucioUrl = .*+WorkQueueManager.rucioUrl = $rucio_host+" $WMA_CONFIG_DIR/config.py + sed -i "s+WorkQueueManager.rucioAuthUrl = .*+WorkQueueManager.rucioAuthUrl = $rucio_auth+" $WMA_CONFIG_DIR/config.py fi local forceSiteDown="" From ff86c12f53a581ccb2194589713befe16541fb3f Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Fri, 17 May 2024 07:13:51 +0200 Subject: [PATCH 3/3] Typo --- docker/pypi/wmagent/init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/pypi/wmagent/init.sh b/docker/pypi/wmagent/init.sh index 103d8c12c..6ef6fdc46 100755 --- a/docker/pypi/wmagent/init.sh +++ b/docker/pypi/wmagent/init.sh @@ -423,8 +423,8 @@ agent_tweakconfig() { sed -i "s+DBSInterface.DBSUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'+DBSInterface.DBSUrl = '$GLOBAL_DBS_URL'+" $WMA_CONFIG_DIR/config.py rucio_host=http://cms-rucio.cern.ch rucio_auth=https://cms-rucio-auth.cern.ch - sed -i "s+WorkQueueManager.rucioUrl = .*+WorkQueueManager.rucioUrl = $rucio_host+" $WMA_CONFIG_DIR/config.py - sed -i "s+WorkQueueManager.rucioAuthUrl = .*+WorkQueueManager.rucioAuthUrl = $rucio_auth+" $WMA_CONFIG_DIR/config.py + sed -i "s+WorkQueueManager.rucioUrl = .*+WorkQueueManager.rucioUrl = '$rucio_host'+" $WMA_CONFIG_DIR/config.py + sed -i "s+WorkQueueManager.rucioAuthUrl = .*+WorkQueueManager.rucioAuthUrl = '$rucio_auth'+" $WMA_CONFIG_DIR/config.py fi local forceSiteDown=""