Fix older release builds

Author: Matthias Wittgen

jobs/test_older_versions.groovy

@@ -9,6 +9,6 @@ p.pipeline().with {
 
   parameters {
     stringParam('PRODUCTS', scipipe.canonical.products + " lsst_sitcom", 'Whitespace delimited list of EUPS products to build.')
-    stringParam('VERSIONS', "o_latest, 29.2.1", 'Versions to test')
+    stringParam('VERSIONS', "o_latest, v29_2_1", 'Versions to test')
   }
 }

pipelines/lib/util.groovy

@@ -1204,14 +1204,22 @@ def void buildOlderVersionMatrix(List LSSTVersions, products) {
 def getNewestTag(){
   def eupsUrl = scipipe.eups.base_url
   def etbUrl = eupsUrl + "/src/tags/"
-  def command = sh(script: "curl -s \"${etbUrl}\" | grep -oE 'v[0-9]+_[0-9]+_[0-9]+' | sed 's/^v//' | sort -t'_' -k1,1n -k2,2n -k3,3n | tail -1 | tr '_' '.'", returnStdout:true).trim()
-
+  def command = sh(
+    script: 'curl -s "' + etbUrl + '" | grep -oE "v[0-9]+_[0-9]+_[0-9]+\\.list" | sed \'s/\\.list$//\' | sort -uV | tail -1',
+    returnStdout: true
+  ).trim()
   return command
 } //getNewestTag
 
+def getRubinEnv(String rubinVer) {
+  def eupsUrl = scipipe.eups.base_url
+  def etbUrl = eupsUrl + "/src/tags/" + rubinVer + ".list"
+  def command = sh(script: "curl -s \"${etbUrl}\" | grep '^#CONDA_ENV=' | cut -d'=' -f2", returnStdout: true).trim()
+  return command
+}
+
 def buildOlderVersionTask(String rubinVer, products, Map lsstswConfig){
   def agent = lsstswConfig.label
-
   def runDocker = {
     insideDockerWrap(
       image: lsstswConfig.image,
@@ -1228,17 +1236,21 @@ def buildOlderVersionTask(String rubinVer, products, Map lsstswConfig){
     // If rubinVer is set to o_latest, get the newest rubin env from eups.lsst
     if (rubinVer == "o_latest") {
       def command = getNewestTag()
-      println command
-      rubinVer = command.replaceAll("v","").replaceAll("_",".")
+      println "Latest tag: ${command}"
+      rubinVer = command
     }
+    def gitTag = rubinVer.replaceAll("^v","").replaceAll("_",".")
+    def rubinEnvVer = getRubinEnv(rubinVer)
+    println "Tag: ${rubinVer}"
+    println "Rubin environment version: ${rubinEnvVer}"
     dir('lsstsw') {
       cloneLsstsw()
     }
       bash """
         cd ${cwd}/lsstsw
-        ./bin/deploy
+        ./bin/deploy -v ${rubinEnvVer}
         . bin/envconfig
-        rebuild -B -r v${rubinVer} -r ${rubinVer} ${products}
+        rebuild -B -r v${gitTag} -r ${gitTag} ${products}
         """
         } // stage
       } // withCredentials