From 28302e11b10c31bd219fe2de96cfc377e04d0926 Mon Sep 17 00:00:00 2001
From: Ross Ceballo <rocebxyz@gmail.com>
Date: Thu, 16 Jan 2025 23:53:36 -0500
Subject: [PATCH] Move copy manifest to within build step

---
 pipelines/lib/util.groovy            | 16 ++--------------
 pipelines/release/run_rebuild.groovy | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pipelines/lib/util.groovy b/pipelines/lib/util.groovy
index cc3936b0..5e1a4d01 100644
--- 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
index 2b84e08d..f2e8a530 100644
--- 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