Move copy manifest to within build step

lsst-dm · Jan 17, 2025 · 28302e1 · 28302e1
1 parent 6c0574e
commit 28302e1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/pipelines/lib/util.groovy b/pipelines/lib/util.groovy
@@ -1385,20 +1385,8 @@ def String runRebuild(Map p) {
     wait: true,
   )
   nodeTiny {
-
-    step([$class: 'CopyArtifact',
-          projectName: useP.job,
-          filter: "**/lsstsw/build/manifest.txt",
-          //target: manifestArtifact,
-          target: 'buildmanifest',
-          selector: [
-            $class: 'SpecificBuildSelector',
-            buildNumber: result.id,
-          ],
-        ])
-    def manifestId = parseManifestId(readFile('buildmanifest/lsstsw/build/manifest.txt'))
-  //  echo sh(returnStdout: true, script: 'env|sort') 
-
+    def manifestId = parseManifestId(readFile('buildmanifest/linux-9-x86/lsstsw/build/manifest.txt'))
+  //  echo sh(returnStdout: true, script: 'env|sort')
     echo "parsed manifest id: ${manifestId}"
     return manifestId
   } // nodeTiny

diff --git a/pipelines/release/run_rebuild.groovy b/pipelines/release/run_rebuild.groovy
@@ -147,6 +147,27 @@ notify.wrap {
             } // withCredentials
           }
         } // stage('push docs')
+        stage('copy manifest'){
+
+        if (lsstswConfig.main_build_arch) {
+
+  util.nodeTiny {
+    step([$class: 'CopyArtifact',
+          projectName: useP.job,
+          filter: "linux-9-x86/lsstsw/build/manifest.txt",
+          //target: manifestArtifact,
+          target: 'buildmanifest',
+          selector: [
+            $class: 'SpecificBuildSelector',
+            buildNumber: result.id,
+          ],
+        ])
+    def manifestId = parseManifestId(readFile('buildmanifest/linux-9-x86/lsstsw/build/manifest.txt'))
+  //  echo sh(returnStdout: true, script: 'env|sort')
+    echo "parsed manifest id: ${manifestId}"
+    } //nodeTiny
+      }
+        } //stage('copy manifest')
       } // ws
     } // run