Merge pull request #10292 from amaltaro/fix-10291

Properly set rucio.cfg in our docker unittest setup
dmwm · Feb 16, 2021 · b150cc7 · b150cc7
2 parents b37f952 + ad0c89c
commit b150cc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/test/deploy/WMAgent_unittest.secrets b/test/deploy/WMAgent_unittest.secrets
@@ -5,6 +5,6 @@ COUCH_PASS=passwd
 COUCH_PORT=6994
 COUCH_HOST=0.0.0.0
 RUCIO_ACCOUNT=wma_test
-RUCIO_HOST=http://cmsrucio-int.cern.ch
-RUCIO_AUTH=https://cmsrucio-auth-int.cern.ch
+RUCIO_HOST=http://cms-rucio.cern.ch
+RUCIO_AUTH=https://cms-rucio-auth.cern.ch
 GRAFANA_TOKEN=test_fake_token
diff --git a/test/deploy/env_unittest.sh b/test/deploy/env_unittest.sh
@@ -46,4 +46,12 @@ source $INSTALL_DIR/current/apps/wmagent/etc/profile.d/init.sh
 source $INSTALL_DIR/current/apps/wmcore-devtools/etc/profile.d/init.sh
 
 export PYTHONPATH=$TEST_SRC/../test/python:$PYTHONPATH
+
+### some Rucio setup needed for jenkins and docker unit tests
+# fetch the values defined in the secrets file and update rucio.cfg file
 export RUCIO_HOME=$config/../rucio/
+MATCH_RUCIO_HOST=`cat $WMAGENT_SECRETS_LOCATION | grep RUCIO_HOST | sed s/RUCIO_HOST=//`
+MATCH_RUCIO_AUTH=`cat $WMAGENT_SECRETS_LOCATION | grep RUCIO_AUTH | sed s/RUCIO_AUTH=//`
+sed -i "s+^rucio_host.*+rucio_host = $MATCH_RUCIO_HOST+" $RUCIO_HOME/etc/rucio.cfg
+sed -i "s+^auth_host.*+auth_host = $MATCH_RUCIO_AUTH+" $RUCIO_HOME/etc/rucio.cfg
+echo "Updated RUCIO_HOME file under: $RUCIO_HOME"