Merge branch 'NOAA-EMC:develop' into feature/3band_sdl_analysis

TravisElless-NOAA · Apr 30, 2024 · a07f670 · a07f670
2 parents 03c9b5a + 762f040
commit a07f670
Show file tree

Hide file tree

Showing 59 changed files with 110 additions and 16,300 deletions.
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
@@ -21,31 +21,60 @@ pipeline {
              // Each Jenknis Node is connected to said machine via an JAVA agent via an ssh tunnel
              // no op 2
 
-        stage('Get Machine') {
+        stage('1. Get Machine') {
             agent { label 'built-in' }
             steps {
                 script {
-                    machine = 'none'
-                    for (label in pullRequest.labels) {
-                        echo "Label: ${label}"
-                        if ((label.matches('CI-Hera-Ready'))) {
-                            machine = 'hera'
-                        } else if ((label.matches('CI-Orion-Ready'))) {
-                            machine = 'orion'
-                        } else if ((label.matches('CI-Hercules-Ready'))) {
-                            machine = 'hercules'
+
+                    def causes = currentBuild.rawBuild.getCauses()
+                    def isSpawnedFromAnotherJob = causes.any { cause ->
+                        cause instanceof hudson.model.Cause.UpstreamCause
+                    }
+
+                    def run_nodes = []
+                    if (isSpawnedFromAnotherJob) {
+                        echo "machine being set to value passed to this spawned job"
+                        echo "passed machine: ${params.machine}"
+                        machine = params.machine
+                    } else {
+                        echo "This is parent job so getting list of nodes matching labels:"
+                        for (label in pullRequest.labels) {
+                            if (label.matches("CI-(.*?)-Ready")) {
+                                def Machine_name = label.split('-')[1].toString()
+                                jenkins.model.Jenkins.get().computers.each { c ->
+                                    if (c.node.selfLabel.name == "${Machine_name}-EMC") {
+                                        run_nodes.add(c.node.selfLabel.name)
+                                    }
+                                }
+                            }
                         }
-                    } // createing a second machine varible with first letter capital
-                      // because the first letter of the machine name is captitalized in the GitHub labels
-                    Machine = machine[0].toUpperCase() + machine.substring(1)
+                        // Spawning all the jobs on the nodes matching the labels
+                        if (run_nodes.size() > 1) {
+                            run_nodes.init().each { node ->
+                                def machine_name = node.split('-')[0].toLowerCase()
+                                echo "Spawning job on node: ${node} with machine name: ${machine_name}"
+                                build job: "/global-workflow/EMC-Global-Pipeline/PR-${env.CHANGE_ID}", parameters: [
+                                    string(name: 'machine', value: machine_name),
+                                    string(name: 'Node', value: node) ],
+                                    wait: false
+                            }
+                            machine = run_nodes.last().split('-')[0].toLowerCase()
+                            echo "Running parent job: ${machine}"
+                        } else {
+                            machine = run_nodes[0].split('-')[0].toLowerCase()
+                            echo "Running only the parent job: ${machine}"
+                        }
+                    }
                 }
             }
         }
 
-        stage('Get Common Workspace') {
+        stage('2. Get Common Workspace') {
             agent { label "${machine}-emc" }
             steps {
                 script {
+                    Machine = machine[0].toUpperCase() + machine.substring(1)
+                    echo "Getting Common Workspace for ${Machine}"
                     ws("${custom_workspace[machine]}/${env.CHANGE_ID}") {
                         properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'Hera-EMC', 'Orion-EMC'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
                         HOME = "${WORKSPACE}"
@@ -57,7 +86,7 @@ pipeline {
             }
         }
 
-        stage('Build System') {
+        stage('3. Build System') {
             matrix {
                 agent { label "${machine}-emc" }
                 //options {
@@ -141,7 +170,7 @@ pipeline {
             }
         }
 
-        stage('Run Tests') {
+        stage('4. Run Tests') {
             failFast false 
             matrix {
                 agent { label "${machine}-emc" }
@@ -216,7 +245,7 @@ pipeline {
                                         STATUS = 'Failed'
                                         try {
                                             sh(script: """${GH} pr edit ${env.CHANGE_ID} --repo ${repo_url} --remove-label "CI-${Machine}-Running" --add-label "CI-${Machine}-${STATUS}" """, returnStatus: true)
-                                            sh(script: """${GH} pr comment ${env.CHANGE_ID} --repo ${repo_url} --body "Experiment ${Case} **FAILED** on ${Machine}\nin\\`${HOME}/RUNTESTS/${pslot}\\`" """)
+                                            sh(script: """${GH} pr comment ${env.CHANGE_ID} --repo ${repo_url} --body "Experiment ${Case} **FAILED** on ${Machine} in\n\\`${HOME}/RUNTESTS/${pslot}\\`" """)
                                         } catch (Exception e) {
                                             echo "Failed to update label from Running to ${STATUS}: ${e.getMessage()}"
                                         }
@@ -229,7 +258,7 @@ pipeline {
                 }
             }
         }
-        stage( 'FINALIZE' ) {
+        stage( '5. FINALIZE' ) {
             when { 
                 expression {
                    STATUS == 'Passed'

diff --git a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
@@ -20,5 +20,4 @@ arguments:
 skip_ci_on_hosts:
   - wcoss2
   - orion
-  - hera
   - hercules
diff --git a/ecf/scripts/gfs/atmos/post_processing/awips_g2/.gitignore b/ecf/scripts/gfs/atmos/post_processing/awips_g2/.gitignore
diff --git a/ecf/scripts/gfs/atmos/post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf b/ecf/scripts/gfs/atmos/post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf
diff --git a/jobs/JGFS_ATMOS_AWIPS_G2 b/jobs/JGFS_ATMOS_AWIPS_G2
diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
@@ -51,7 +51,8 @@ if [[ "${DO_OCN}" == "YES" ]]; then
   YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx COM_MED_RESTART COM_OCEAN_RESTART COM_OCEAN_INPUT \
     COM_OCEAN_HISTORY COM_OCEAN_ANALYSIS
   RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \
-    COM_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL
+    COM_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL \
+    COM_MED_RESTART_PREV:COM_MED_RESTART_TMPL
 fi
 
 if [[ "${DO_ICE}" == "YES" ]]; then

diff --git a/jobs/rocoto/awips_g2.sh b/jobs/rocoto/awips_g2.sh
diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
@@ -150,4 +150,10 @@ if [[ ${RUN_ENVIR} == "emc" ]]; then
   #   fi
 fi
 
+# Flag to turn on (.true.) or off (.false.) the infrared cloud and aerosol detection software
+# for AIRS, CrIS, and IASI.  Default is .false.
+export AIRS_CADS=".false."
+export CRIS_CADS=".false."
+export IASI_CADS=".false."
+
 echo "END: config.anal"
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,5 +20,4 @@ arguments: @@
     skip_ci_on_hosts:
       - wcoss2
       - orion
-      - hera
       - hercules