Test run

lsst-dm · Jan 24, 2025 · 025c3bb · 025c3bb
1 parent 4681d7c
commit 025c3bb
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 90 deletions.
diff --git a/pipelines/release/docker/build_stack.groovy b/pipelines/release/docker/build_stack.groovy
@@ -133,7 +133,6 @@ notify.wrap {
         ) {
           registryTags.each { name ->
             image.push(name)
-            )
           }
           newRegistryTags.each { name ->
             image3.push(name)
@@ -147,10 +146,10 @@ notify.wrap {
             image2.push(name)
           }
         }
-            digest =
-            sh(
+            digest =sh(
             script: "docker inspect --format='{{index .RepoDigests 0}}' ${dockerRepo}:${dockerTag}",
             returnStdout: true
+            )
 
       }
           dockerdigest.add(digest)
@@ -193,7 +192,10 @@ notify.wrap {
           'https://index.docker.io/v1/',
           'dockerhub-sqreadmin'
         ) {
-        sh("docker buildx imagetools create $dockerdigest.join(' ') -t $dockerRepo:$dockerTag")
+        println("Digest: "+ dockerdigest)
+        def digest = dockerdigest.join(' ')
+        sh(script:"docker buildx imagetools create ${digest} -t ${dockerRepo}:${dockerTag}",
+        returnStdout: true)
     }
     }
 

diff --git a/pipelines/release/nightly_release.groovy b/pipelines/release/nightly_release.groovy
@@ -34,100 +34,102 @@ notify.wrap {
   def lsstswConfig = scipipe.canonical.lsstsw_config
 
   def run = {
-    stage('format nightly tag') {
-      gitTag  = "exp.d.${year}.${month}.${day}"
-      eupsTag = util.sanitizeEupsTag(gitTag)
-      echo "generated [git] tag: ${gitTag}"
-      echo "generated [eups] tag: ${eupsTag}"
-    } // stage
+    //stage('format nightly tag') {
+    //  gitTag  = "exp.d.${year}.${month}.${day}"
+    //  eupsTag = util.sanitizeEupsTag(gitTag)
+    //  echo "generated [git] tag: ${gitTag}"
+    //  echo "generated [eups] tag: ${eupsTag}"
+    //} // stage
 
-    stage('build') {
-      retry(retries) {
-        manifestId = util.runRebuild(
-          parameters: [
-            PRODUCTS: products,
-            BUILD_DOCS: true,
-          ],
-        )
-      } // retry
-    } // stage
+    //stage('build') {
+    //  retry(retries) {
+    //    manifestId = util.runRebuild(
+    //      parameters: [
+    //        PRODUCTS: products,
+    //        BUILD_DOCS: true,
+    //      ],
+    //    )
+    //  } // retry
+    //} // stage
 
-    stage('eups publish') {
-      def pub = [:]
+    //stage('eups publish') {
+    //  def pub = [:]
 
-      [eupsTag,
-      //'d_latest'
-      ].each { tagName ->
-        pub[tagName] = {
-          retry(retries) {
-            util.runPublish(
-              parameters: [
-                EUPSPKG_SOURCE: 'git',
-                MANIFEST_ID: manifestId,
-                EUPS_TAG: tagName,
-                PRODUCTS: products,
-                BUILD_DOCS: true,
-              ],
-            )
-          } // retry
-        } // pub
-      } // each
+    //  [eupsTag,
+    //  //'d_latest'
+    //  ].each { tagName ->
+    //    pub[tagName] = {
+    //      retry(retries) {
+    //        util.runPublish(
+    //          parameters: [
+    //            EUPSPKG_SOURCE: 'git',
+    //            MANIFEST_ID: manifestId,
+    //            EUPS_TAG: tagName,
+    //            PRODUCTS: products,
+    //            BUILD_DOCS: true,
+    //          ],
+    //        )
+    //      } // retry
+    //    } // pub
+    //  } // each
 
-      parallel pub
-    } // stage
+    //  parallel pub
+    //} // stage
 
-    util.waitForS3()
+    //util.waitForS3()
 
-    // NOOP / DRY_RUN
-    stage('git tag eups products') {
-      retry(retries) {
-        util.nodeWrap('docker') {
-          // needs eups distrib tag to be sync'd from s3 -> k8s volume
-          util.githubTagRelease(
-            options: [
-              '--dry-run': true,
-              '--org': scipipe.release_tag_org,
-              '--manifest': manifestId,
-              '--eups-tag': eupsTag,
-            ],
-            args: [gitTag],
-          )
-        } // util.nodeWrap
-      } // retry
-    } // stage
+    //// NOOP / DRY_RUN
+    //stage('git tag eups products') {
+    //  retry(retries) {
+    //    util.nodeWrap('docker') {
+    //      // needs eups distrib tag to be sync'd from s3 -> k8s volume
+    //      util.githubTagRelease(
+    //        options: [
+    //          '--dry-run': true,
+    //          '--org': scipipe.release_tag_org,
+    //          '--manifest': manifestId,
+    //          '--eups-tag': eupsTag,
+    //        ],
+    //        args: [gitTag],
+    //      )
+    //    } // util.nodeWrap
+    //  } // retry
+    //} // stage
 
-    // add aux repo tags *after* tagging eups product repos so as to avoid a
-    // trainwreck if an aux repo has been pulled into the build (without
-    // first being removed from the aux team).
-    stage('git tag auxilliaries') {
-      retry(retries) {
-        util.nodeWrap('docker') {
-          util.githubTagTeams(
-            options: [
-              '--dry-run': true,
-              '--org': scipipe.release_tag_org,
-              '--tag': gitTag,
-            ],
-          )
-        } // util.nodeWrap
-      } // retry
-    } // stage
+    //// add aux repo tags *after* tagging eups product repos so as to avoid a
+    //// trainwreck if an aux repo has been pulled into the build (without
+    //// first being removed from the aux team).
+    //stage('git tag auxilliaries') {
+    //  retry(retries) {
+    //    util.nodeWrap('docker') {
+    //      util.githubTagTeams(
+    //        options: [
+    //          '--dry-run': true,
+    //          '--org': scipipe.release_tag_org,
+    //          '--tag': gitTag,
+    //        ],
+    //      )
+    //    } // util.nodeWrap
+    //  } // retry
+    //} // stage
 
-    stage('build eups tarballs') {
-      util.buildTarballMatrix(
-        tarballConfigs: scipipe.tarball.build_config,
-        parameters: [
-          PRODUCTS: tarballProducts,
-          EUPS_TAG: eupsTag,
-          SMOKE: true,
-          RUN_SCONS_CHECK: true,
-          PUBLISH: true,
-        ],
-        retries: retries,
-      )
-    } // stage
+    //stage('build eups tarballs') {
+    //  util.buildTarballMatrix(
+    //    tarballConfigs: scipipe.tarball.build_config,
+    //    parameters: [
+    //      PRODUCTS: tarballProducts,
+    //      EUPS_TAG: eupsTag,
+    //      SMOKE: true,
+    //      RUN_SCONS_CHECK: true,
+    //      PUBLISH: true,
+    //    ],
+    //    retries: retries,
+    //  )
+    //} // stage
 
-    util.waitForS3()
+    //util.waitForS3()
+    manifestId = 'b7498'
+    eupsTag = 'exp_d_2025_01_22'
 
     stage('build stack image') {
       retry(retries) {
@@ -253,7 +255,7 @@ notify.wrap {
     }
 
     stage('triggered jobs') {
-      parallel triggerMe
+    //  parallel triggerMe
     } // stage
   } // run