Revert to only building x86

lsst-dm · Jan 18, 2025 · 048258d · 048258d
1 parent c76b705
commit 048258d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 42 deletions.
diff --git a/etc/scipipe/build_matrix.yaml b/etc/scipipe/build_matrix.yaml
@@ -78,11 +78,8 @@ scipipe-lsstsw-ci_imsim:
 canonical:
   products: &canonical_products lsst_distrib lsst_ci lsst_middleware
   lsstsw_config:
-    - <<: *el7-conda
-      label: snowflake-0
-      main_build_arch: true
-    - <<: *linux-9-arm
-      label: snowflake-arch-0
+    <<: *el7-conda
+    label: snowflake-0
   workspace: snowflake/release
 #
 # eups distrib tarball configuration -- used by

diff --git a/pipelines/lib/util.groovy b/pipelines/lib/util.groovy
@@ -1385,7 +1385,18 @@ def String runRebuild(Map p) {
     wait: true,
   )
   nodeTiny {
-    def manifestId = parseManifestId(readFile('manifest/lsstsw/build/manifest.txt'))
+          manifestArtifact = 'lsstsw/build/manifest.txt'
+
+    step([$class: 'CopyArtifact',
+          projectName: useP.job,
+          filter: manifestArtifact,
+          selector: [
+            $class: 'SpecificBuildSelector',
+            buildNumber: result.id,
+          ],
+        ])
+
+    def manifestId = parseManifestId(readFile(manifestArtifact))
   //  echo sh(returnStdout: true, script: 'env|sort')
     echo "parsed manifest id: ${manifestId}"
     return manifestId

diff --git a/pipelines/release/run_rebuild.groovy b/pipelines/release/run_rebuild.groovy
@@ -45,14 +45,10 @@ notify.wrap {
   }
 
   def canonical    = scipipe.canonical
-  def lsstswConfigs = canonical.lsstsw_config
+  def lsstswConfig = canonical.lsstsw_config
 
-  def matrix = [:]
-  lsstswConfigs.each{ lsstswConfig ->
-    def slug = util.lsstswConfigSlug(lsstswConfig)
-    matrix[slug] ={
     def run = {
-      def workingDir = canonical.workspace + "/${lsstswConfig.display_name}"
+      def workingDir = canonical.workspace
       ws(workingDir) {
       def cwd = pwd()
       splenvRef = lsstswConfig.splenv_ref
@@ -72,13 +68,9 @@ notify.wrap {
         LSST_PYTHON_VERSION: lsstswConfig.python,
         LSST_SPLENV_REF:     splenvRef,
         LSST_REFS:           refs,
-      ]
-      if(lsstswConfig.main_build_arch){
-        buildParams = [
        VERSIONDB_PUSH:      versiondbPush,
         VERSIONDB_REPO:      versiondbRepo,
-        ] + buildParams
-      }
+      ]
 
       def runJW = {
         // note that util.jenkinsWrapper() clones the ci-scripts repo, which is
@@ -147,27 +139,6 @@ notify.wrap {
             } // withCredentials
           }
         } // stage('push docs')
-        stage('copy manifest'){
-
-        if (lsstswConfig.main_build_arch) {
-
-  util.nodeTiny {
-    step([$class: 'CopyArtifact',
-          projectName: env.JOB_NAME,
-          filter: "**/lsstsw/build/manifest.txt",
-          //target: manifestArtifact,
-          target: 'manifest',
-          selector: [
-            $class: 'SpecificBuildSelector',
-            buildNumber: env.BUILD_NUMBER,
-          ],
-        ])
-    def manifestId = util.parseManifestId(readFile('manifest/lsstsw/build/manifest.txt'))
-  //  echo sh(returnStdout: true, script: 'env|sort')
-    echo "parsed manifest id: ${manifestId}"
-    } //nodeTiny
-      }
-        } //stage('copy manifest')
       } // ws
     } // run
 
@@ -176,8 +147,4 @@ notify.wrap {
       run()
       }
     }
-  }
-}
-parallel matrix
-
 } // notify.wrap