Adjustments for testing in prod

lsst-dm · Dec 21, 2024 · 8e7a025 · 8e7a025
1 parent f8a474f
commit 8e7a025
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 73 deletions.
diff --git a/pipelines/lib/util.groovy b/pipelines/lib/util.groovy
@@ -698,7 +698,7 @@ def void getManifest(String rebuildId, String filename) {
           buildNumber: rebuildId // wants a string
           ],
         ])
-    def manifest = readFile('buildmanifest/linux-9-x86/lsstsw/build/manifest.txt')
+    def manifest = readFile('buildmanifest/lsstsw/build/manifest.txt')
     writeFile(file: filename, text: manifest)
 } // getManifest
 
@@ -1387,8 +1387,6 @@ def String runRebuild(Map p) {
   )
   nodeTiny {
 
-    println("This is the output")
-
     step([$class: 'CopyArtifact',
           projectName: useP.job,
           filter: "**/lsstsw/build/manifest.txt",
@@ -1400,6 +1398,7 @@ def String runRebuild(Map p) {
           ],
         ])
     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

diff --git a/pipelines/release/nightly_release.groovy b/pipelines/release/nightly_release.groovy
@@ -55,7 +55,9 @@ notify.wrap {
     stage('eups publish') {
       def pub = [:]
 
-      [eupsTag, 'd_latest'].each { tagName ->
+      [eupsTag, 
+      //'d_latest'
+      ].each { tagName ->
         pub[tagName] = {
           retry(retries) {
             util.runPublish(
@@ -119,13 +121,13 @@ notify.wrap {
           EUPS_TAG: eupsTag,
           SMOKE: true,
           RUN_SCONS_CHECK: true,
-          PUBLISH: true,
+          PUBLISH: false,
         ],
         retries: retries,
       )
     } // stage
 
-    util.waitForS3()
+    // util.waitForS3()
 
     stage('build stack image') {
       retry(retries) {
@@ -135,80 +137,80 @@ notify.wrap {
             EUPS_TAG: eupsTag,
             DOCKER_TAGS: extraDockerTags,
             MANIFEST_ID: manifestId,
-            LSST_COMPILER: lsstswConfig.compiler[0],
+            LSST_COMPILER: lsstswConfigs.compiler[0],
           ],
         )
       } // retry
     } // stage
 
     def triggerMe = [:]
 
-    triggerMe['build Science Platform Notebook Aspect Lab image'] = {
-      retry(retries) {
-        // based on lsstsqre/stack image
-        build(
-          job: 'sqre/infra/build-sciplatlab',
-          parameters: [
-            string(name: 'TAG', value: eupsTag),
-          ],
-          wait: false,
-        )
-      } // retry
-    }
-
-    triggerMe['verify_drp_metrics'] = {
-      retry(1) {
-        // based on lsstsqre/stack image
-        build(
-          job: 'sqre/verify_drp_metrics',
-          parameters: [
-            string(name: 'DOCKER_IMAGE', value: stackResults.image),
-            booleanParam(
-              name: 'NO_PUSH',
-              value: scipipe.release.step.verify_drp_metrics.no_push,
-            ),
-            booleanParam(name: 'WIPEOUT', value: false),
-            string(name: 'GIT_REF', value: 'main'),
-          ],
-          wait: false,
-        )
-      } // retry
-    }
-
-    triggerMe['doc build'] = {
-      retry(retries) {
-        build(
-          job: 'sqre/infra/documenteer',
-          parameters: [
-            string(name: 'EUPS_TAG', value: eupsTag),
-            string(name: 'LTD_SLUG', value: eupsTag),
-            string(name: 'RELEASE_IMAGE', value: stackResults.image),
-            booleanParam(
-              name: 'PUBLISH',
-              value: scipipe.release.step.documenteer.publish,
-            ),
-          ],
-          wait: false,
-        )
-      } // retry
-    }
-
-    triggerMe['ap_verify'] = {
-      retry(retries) {
-        build(
-          job: 'scipipe/ap_verify',
-          parameters: [
-            string(name: 'DOCKER_IMAGE', value: stackResults.image),
-            booleanParam(
-              name: 'NO_PUSH',
-              value: scipipe.release.step.ap_verify.no_push,
-            ),
-            booleanParam(name: 'WIPEOUT', value: false),
-          ],
-          wait: false,
-        )
-      } // retry
-    }
+    // triggerMe['build Science Platform Notebook Aspect Lab image'] = {
+    //   retry(retries) {
+    //     // based on lsstsqre/stack image
+    //     build(
+    //       job: 'sqre/infra/build-sciplatlab',
+    //       parameters: [
+    //         string(name: 'TAG', value: eupsTag),
+    //       ],
+    //       wait: false,
+    //     )
+    //   } // retry
+    // }
+
+    // triggerMe['verify_drp_metrics'] = {
+    //   retry(1) {
+    //     // based on lsstsqre/stack image
+    //     build(
+    //       job: 'sqre/verify_drp_metrics',
+    //       parameters: [
+    //         string(name: 'DOCKER_IMAGE', value: stackResults.image),
+    //         booleanParam(
+    //           name: 'NO_PUSH',
+    //           value: scipipe.release.step.verify_drp_metrics.no_push,
+    //         ),
+    //         booleanParam(name: 'WIPEOUT', value: false),
+    //         string(name: 'GIT_REF', value: 'main'),
+    //       ],
+    //       wait: false,
+    //     )
+    //   } // retry
+    // }
+
+    // triggerMe['doc build'] = {
+    //   retry(retries) {
+    //     build(
+    //       job: 'sqre/infra/documenteer',
+    //       parameters: [
+    //         string(name: 'EUPS_TAG', value: eupsTag),
+    //         string(name: 'LTD_SLUG', value: eupsTag),
+    //         string(name: 'RELEASE_IMAGE', value: stackResults.image),
+    //         booleanParam(
+    //           name: 'PUBLISH',
+    //           value: scipipe.release.step.documenteer.publish,
+    //         ),
+    //       ],
+    //       wait: false,
+    //     )
+    //   } // retry
+    // }
+
+    // triggerMe['ap_verify'] = {
+    //   retry(retries) {
+    //     build(
+    //       job: 'scipipe/ap_verify',
+    //       parameters: [
+    //         string(name: 'DOCKER_IMAGE', value: stackResults.image),
+    //         booleanParam(
+    //           name: 'NO_PUSH',
+    //           value: scipipe.release.step.ap_verify.no_push,
+    //         ),
+    //         booleanParam(name: 'WIPEOUT', value: false),
+    //       ],
+    //       wait: false,
+    //     )
+    //   } // retry
+    // }
 
     stage('triggered jobs') {
       parallel triggerMe