fix: consistent RCDB URIs

Author: c-dilks

.github/workflows/ci.yml

@@ -12,7 +12,6 @@ defaults:
 
 env:
   dataset: ci_test
-  rcdb_connection: mysql://rcdb@clasdb.jlab.org/rcdb # RCDB server available to runners
   # NOTE: if any of these versions are changed, update the POM files too
   java_version: 21
   java_distribution: zulu
@@ -143,8 +142,6 @@ jobs:
       run: ls *.tar.zst | xargs -I{} tar xavf {}
     - name: tree
       run: tree
-    - name: set RCDB connection # to one that's available to the runner
-      run: echo RCDB_CONNECTION=${{env.rcdb_connection}} | tee -a $GITHUB_ENV
     - name: run monitoring
       run: bin/run-monitoring.sh -d ${{env.dataset}} --findhipo --series --focus-${{matrix.type}} validation_files
     - name: tree slurm
@@ -197,8 +194,6 @@ jobs:
       run: ls *.tar.zst | xargs -I{} tar xavf {}
     - name: tree
       run: tree
-    - name: set RCDB connection # to one that's available to the runner
-      run: echo RCDB_CONNECTION=${{env.rcdb_connection}} | tee -a $GITHUB_ENV
     - name: test monitoring swifjob
       run: |
         single_rundir=$(find validation_files -mindepth 1 -maxdepth 1 -type d | head -n1)

bin/environ.sh

@@ -12,7 +12,7 @@ log_config=logging # set to 'logging' for quiet, or to 'debug' for verbose
 export TIMELINESRC=$(realpath $(dirname $thisEnv)/..)
 
 # RCDB
-[ -z "${RCDB_CONNECTION-}" ] && RCDB_CONNECTION=mysql://rcdb@clasdb-farm.jlab.org/rcdb
+[ -z "${RCDB_CONNECTION-}" ] && RCDB_CONNECTION=mysql://rcdb@clasdb.jlab.org/rcdb
 export RCDB_CONNECTION
 
 # check coatjava environment

qa-physics/QA/modifyQaTree.groovy

@@ -247,7 +247,10 @@ else if(cmd=="misc") {
     if(args.length<5 || args[4]=="all") secList = (1..6).collect{it}
     else (4..<args.length).each{ secList<<args[it].toInteger() }
 
-    def db = RCDB.createProvider("mysql://rcdb@clasdb/rcdb")
+    def rcdbURL = System.getenv('RCDB_CONNECTION')
+    if(rcdbURL==null)
+      throw new Exception("RCDB_CONNECTION not set")
+    def db = RCDB.createProvider(rcdbURL)
     def shift_expert_comment = null
     try {
       db.connect()

qa-physics/QA/parseQaTree.groovy

@@ -35,7 +35,9 @@ SQLite : sqlite:////group/clas12/rcdb/example.db
 */
 
 // Open SQL database connection
-def address = "mysql://rcdb@clasdb/rcdb"
+def address = System.getenv('RCDB_CONNECTION')
+if(address==null)
+  throw new Exception("RCDB_CONNECTION not set")
 def db      = RCDB.createProvider(address)
 def success = false
 try { db.connect(); success = true; println("Connected to "+address) }