Skip to content

Commit 2bcd2bb

Browse files
authored
Merge branch 'NOAA-EMC:develop' into pantemp
2 parents 7a4a771 + 466c680 commit 2bcd2bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+156
-93
lines changed

ci/Jenkinsfile4AWS

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ def CUSTOM_WORKSPACE = 'none'
44
def HOMEgfs = 'none'
55
def CI_CASES = ''
66
def GH = 'none'
7+
//Trivial change
78
// Location of the custom workspaces for each machine in the CI system. They are persistent for each iteration of the PR.
8-
def NodeName = [hera: 'Hera-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaea: 'Gaea', noaacloud: 'awsepicglobalworkflow']
9-
def custom_workspace = [hera: '/scratch1/NCEPDEV/global/CI', orion: '/work2/noaa/stmp/CI/ORION', hercules: '/work2/noaa/global/CI/HERCULES', gaea: '/gpfs/f5/epic/proj-shared/global/CI', noaacloud: '/lustre/jenkins']
10-
def repo_url = '[email protected]:NOAA-EMC/global-workflow.git'
9+
def NodeName = [hera: 'Hera-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaea: 'Gaea', awsepicglobalworkflow: 'Awsepicglobalworkflow']
10+
def custom_workspace = [hera: '/scratch1/NCEPDEV/global/CI', orion: '/work2/noaa/stmp/CI/ORION', hercules: '/work2/noaa/global/CI/HERCULES', gaea: '/gpfs/f5/epic/proj-shared/global/CI', awsepicglobalworkflow: '/lustre/jenkins']
11+
def repo_url = 'https://github.com/NOAA-EMC/global-workflow.git'
12+
def aws_gw_name = 'global-workflow'
1113
def STATUS = 'Passed'
1214

1315
pipeline {
@@ -42,9 +44,12 @@ pipeline {
4244
} else {
4345
echo "This is parent job so getting list of nodes matching labels:"
4446
for (label in pullRequest.labels) {
47+
echo "Checking label: ${label}"
4548
if (label.matches("CI-(.*?)-Ready")) {
4649
def machine_name = label.split('-')[1].toString().toLowerCase()
50+
print machine_name
4751
jenkins.model.Jenkins.get().computers.each { c ->
52+
print c.node.selfLabel.name
4853
if (c.node.selfLabel.name == NodeName[machine_name]) {
4954
run_nodes.add(c.node.selfLabel.name)
5055
}
@@ -56,7 +61,7 @@ pipeline {
5661
run_nodes.init().each { node ->
5762
def machine_name = node.split('-')[0].toLowerCase()
5863
echo "Spawning job on node: ${node} with machine name: ${machine_name}"
59-
build job: "/global-workflow/EMC-Global-Pipeline/PR-${env.CHANGE_ID}", parameters: [
64+
build job: "/${aws_gw_name}/AWS-EPIC-Global-Workflow-Pipeline/PR-${env.CHANGE_ID}", parameters: [
6065
string(name: 'machine', value: machine_name),
6166
string(name: 'Node', value: node) ],
6267
wait: false
@@ -79,11 +84,11 @@ pipeline {
7984
Machine = machine[0].toUpperCase() + machine.substring(1)
8085
echo "Getting Common Workspace for ${Machine}"
8186
ws("${custom_workspace[machine]}/${env.CHANGE_ID}") {
82-
properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'Hercules-EMC', 'Hera-EMC', 'Orion-EMC', 'Gaea', 'awsepicglobalworkflow'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
87+
properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'Hercules-EMC', 'Hera-EMC', 'Orion-EMC', 'Gaea', 'Awsepicglobalworkflow'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
8388
GH = sh(script: "which gh || echo '~/bin/gh'", returnStdout: true).trim()
84-
CUSTOM_WORKSPACE = "${WORKSPACE}"
85-
HOMEgfs = "${CUSTOM_WORKSPACE}/global-workflow"
86-
sh(script: "rm -Rf ${CUSTOM_WORKSPACE}/global-workflow; mkdir -p ${CUSTOM_WORKSPACE}/global-workflow")
89+
CUSTOM_WORKSPACE = "${custom_workspace[machine]}/${env.CHANGE_ID}/${aws_gw_name}"
90+
HOMEgfs = "${CUSTOM_WORKSPACE}/${aws_gw_name}"
91+
sh(script: "rm -Rf ${CUSTOM_WORKSPACE}; mkdir -p ${CUSTOM_WORKSPACE}/${aws_gw_name}")
8792
sh(script: "rm -Rf ${CUSTOM_WORKSPACE}/RUNTESTS; mkdir -p ${CUSTOM_WORKSPACE}/RUNTESTS")
8893
sh(script: """${GH} pr edit ${env.CHANGE_ID} --repo ${repo_url} --add-label "CI-${Machine}-Building" --remove-label "CI-${Machine}-Ready" """)
8994
}
@@ -95,17 +100,24 @@ pipeline {
95100
stage('3. Build System') {
96101
agent { label NodeName[machine].toLowerCase() }
97102
steps {
103+
dir("${HOMEgfs}") {
104+
checkout scm
105+
}
98106
catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
99107
script {
100108
ws(HOMEgfs) {
101109
echo "Checking out the code on ${Machine} using scm in ${HOMEgfs}"
102110
try {
103-
checkout scm
111+
// checkout scm
112+
// sh(script: "git clone --recursive ${repo_url}")
113+
sh(script: "ls ${HOMEgfs}")
104114
} catch (Exception e) {
105115
echo "Failed to checkout the code on ${Machine} using scm in ${HOMEgfs}, try again ..."
106116
sleep time: 45, unit: 'SECONDS'
107117
try {
108-
checkout scm
118+
// checkout scm
119+
// sh(script: "git clone --recursive ${repo_url}")
120+
sh(script: "ls ${HOMEgfs}/sorc")
109121
} catch (Exception ee) {
110122
echo "Failed to checkout the code on ${Machine} using scm in ${HOMEgfs}: ${ee.getMessage()}"
111123
if (env.CHANGE_ID) {
@@ -120,7 +132,9 @@ pipeline {
120132
def error_logs_message = ""
121133
dir("${HOMEgfs}/sorc") {
122134
try {
123-
sh(script: './build_compute.sh all') // build the global-workflow executables
135+
sh(script: 'ls ./build_compute.sh') // list files here to make sure all files exist.
136+
sh(script: './build_compute.sh gfs') // build the global-workflow executables
137+
sh(script: './build_compute.sh gefs') // build the global-workflow executables
124138
} catch (Exception error_build) {
125139
echo "Failed to build global-workflow: ${error_build.getMessage()}"
126140
if ( fileExists("logs/error.logs") ) {

ci/cases/gfsv17/marinehyb.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ base:
99
DO_JEDISNOWDA: "NO"
1010
DO_MERGENSST: "NO"
1111
DOHYBVAR_OCN: "YES"
12+
DOLETKF_OCN: "NO"
1213
DO_FIT2OBS: "YES"
1314
DO_VERFOZN: "YES"
1415
DO_VERFRAD: "YES"

ci/cases/pr/C48_S2SW.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ arguments:
1212
idate: 2021032312
1313
edate: 2021032312
1414
yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml
15+

ci/cases/pr/C48_S2SW_extended.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ skip_ci_on_hosts:
1919
- gaeac6
2020
- orion
2121
- hercules
22+
- awsepicglobalworkflow
2223
- wcoss2 # TODO run on WCOSS2 once the gfs_waveawipsbulls job is fixed

ci/cases/pr/C48mx500_3DVarAOWCDA.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ skip_ci_on_hosts:
2121
- gaeac6
2222
- gaeac5
2323
- orion
24+
- awsepicglobalworkflow

ci/cases/pr/C48mx500_hybAOWCDA.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ skip_ci_on_hosts:
2222
- gaeac5
2323
- gaeac6
2424
- orion
25+
- awsepicglobalworkflow

ci/cases/pr/C96C48_hybatmDA.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ arguments:
1717
interval: 24
1818
start: cold
1919
yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml
20+
21+
skip_ci_on_hosts:
22+
- awsepicglobalworkflow
23+
- gaeac5

ci/cases/pr/C96C48_hybatmaerosnowDA.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ skip_ci_on_hosts:
2222
- gaeac5
2323
- gaeac6
2424
- hercules
25+
- awsepicglobalworkflow

ci/cases/pr/C96C48_ufs_hybatmDA.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ skip_ci_on_hosts:
2222
- gaeac6
2323
- orion
2424
- hercules
25+
- awsepicglobalworkflow

ci/cases/pr/C96_atm3DVar.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ arguments:
1717
yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_metp_ci.yaml
1818

1919
skip_ci_on_hosts:
20+
- gaeac5
2021
- wcoss2
22+
- awsepicglobalworkflow

0 commit comments

Comments
 (0)