Skip to content

Commit e58ee96

Browse files
FernandoAndrade-NOAAFernandoAndrade-NOAA
authored
Update Jenkinsfile.ort removed cpld test
1 parent 9cb2928 commit e58ee96

File tree

1 file changed

+3
-128
lines changed

1 file changed

+3
-128
lines changed

‎tests/ci/Jenkinsfile.ort‎

Lines changed: 3 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -94,46 +94,6 @@ stage('Run ORT on Ursa parallel'){
9494
'''
9595
} //steps
9696
} //stage
97-
stage('cpld_control_nowave_noaero_p8'){
98-
agent{ label 'ursa'}
99-
options{
100-
timeout(time:6, unit:'HOURS')
101-
}
102-
environment {
103-
ACCNR = 'epic'
104-
NODE_PATH = '/scratch3/NAGAPE/epic/role-epic/'
105-
GITHUB_TOKEN = credentials('GithubJenkinsNew')
106-
}
107-
when{
108-
beforeAgent true
109-
expression { env.CHOICE_NODE == "ursa" ? true : null }
110-
}
111-
steps{
112-
cleanWs()
113-
checkout scm
114-
sh '''
115-
git submodule update --init --recursive
116-
cd tests/fv3_conf
117-
sed 's/#SBATCH --time=.*/#SBATCH --time=02:00:00/g' -i fv3_slurm.IN_ursa
118-
cd ..
119-
export machine=${NODE_NAME}
120-
export PATH=$PATH:~/bin
121-
export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
122-
export FORK_BRANCH=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.ref')
123-
export ACCNR=epic
124-
export GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
125-
export GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
126-
127-
pwd
128-
./opnReqTest -n cpld_control_nowave_noaero_p8 -a ${ACCNR} -c dbg,rst
129-
cd logs/
130-
# change "cp" to "mv" to be tighter on logfiles existence (prevents using logfiles from a previous run)
131-
mv OpnReqTests_cpld_control_nowave_noaero_p8_ursa.log /scratch3/NAGAPE/epic/role-epic/jenkins/workspace/
132-
cd ..
133-
pwd
134-
'''
135-
} //steps
136-
} //stage
13797
stage('control_p8'){
13898
agent{ label 'ursa' }
13999
options{
@@ -214,14 +174,13 @@ stage('Run ORT on Ursa parallel'){
214174
# change "cp" to "mv" to be tighter on logfiles existence (prevents using logfiles from a previous run)
215175
mv OpnReqTests_control_p8_ursa.log $WORKSPACE/tests/logs/
216176
mv OpnReqTests_regional_control_ursa.log $WORKSPACE/tests/logs/
217-
mv OpnReqTests_cpld_control_nowave_noaero_p8_ursa.log $WORKSPACE/tests/logs/
218177
cd $WORKSPACE/tests/
219178
git config user.email "ecc.platform@noaa.gov"
220179
git config user.name "epic-cicd-jenkins"
221180
export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }')
222181
git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
223182
git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
224-
git add logs/OpnReqTests_control_p8_ursa.log logs/OpnReqTests_regional_control_ursa.log logs/OpnReqTests_cpld_control_nowave_noaero_p8_ursa.log
183+
git add logs/OpnReqTests_control_p8_ursa.log logs/OpnReqTests_regional_control_ursa.log
225184
git commit -m "ORT Jobs Completed.\n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"
226185
git pull sshorigin $FORK_BRANCH
227186
git push sshorigin HEAD:$FORK_BRANCH
@@ -304,47 +263,6 @@ stage('Run ORT on Ursa parallel'){
304263
} //steps
305264
} //stage
306265

307-
stage('cpld_control_nowave_noaero_p8'){
308-
agent{ label 'hercules'}
309-
options{
310-
timeout(time:6, unit:'HOURS')
311-
}
312-
environment {
313-
ACCNR = 'epic'
314-
NODE_PATH = '/work2/noaa/epic/role-epic/'
315-
GITHUB_TOKEN = credentials('GithubJenkinsNew')
316-
}
317-
when{
318-
beforeAgent true
319-
expression { env.CHOICE_NODE == "hercules" ? true : null }
320-
}
321-
steps{
322-
cleanWs()
323-
checkout scm
324-
sh '''
325-
git submodule update --init --recursive
326-
cd tests/fv3_conf
327-
sed 's/#SBATCH --time=.*/#SBATCH --time=02:00:00/g' -i fv3_slurm.IN_hercules
328-
cd ..
329-
export machine=${NODE_NAME}
330-
export PATH=$PATH:~/bin
331-
export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
332-
export FORK_BRANCH=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.ref')
333-
export ACCNR=epic
334-
export GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
335-
export GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
336-
337-
pwd
338-
./opnReqTest -n cpld_control_nowave_noaero_p8 -a ${ACCNR} -c dbg,rst
339-
cd logs/
340-
# change "cp" to "mv" to be tighter on logfiles existence (prevents using logfiles from a previous run)
341-
mv OpnReqTests_cpld_control_nowave_noaero_p8_hercules.log /work2/noaa/epic/role-epic/jenkins/workspace/
342-
cd ..
343-
pwd
344-
'''
345-
} //steps
346-
} //stage
347-
348266
stage('control_p8'){
349267
agent{ label 'hercules' }
350268
options{
@@ -424,14 +342,13 @@ stage('Run ORT on Ursa parallel'){
424342
# change "cp" to "mv" to be tighter on logfiles existence (prevents using logfiles from a previous run)
425343
mv OpnReqTests_control_p8_hercules.log $WORKSPACE/tests/logs/
426344
mv OpnReqTests_regional_control_hercules.log $WORKSPACE/tests/logs/
427-
mv OpnReqTests_cpld_control_nowave_noaero_p8_hercules.log $WORKSPACE/tests/logs/
428345
cd $WORKSPACE/tests/
429346
git config user.email "ecc.platform@noaa.gov"
430347
git config user.name "epic-cicd-jenkins"
431348
export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }')
432349
git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
433350
git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
434-
git add logs/OpnReqTests_control_p8_hercules.log logs/OpnReqTests_regional_control_hercules.log logs/OpnReqTests_cpld_control_nowave_noaero_p8_hercules.log
351+
git add logs/OpnReqTests_control_p8_hercules.log logs/OpnReqTests_regional_control_hercules.log
435352
git commit -m "ORT Jobs Completed.\n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"
436353
git pull sshorigin $FORK_BRANCH
437354
git push sshorigin HEAD:$FORK_BRANCH
@@ -514,47 +431,6 @@ stage('Run ORT on Ursa parallel'){
514431
} //steps
515432
} //stage
516433

517-
stage('cpld_control_nowave_noaero_p8'){
518-
agent{ label 'orion'}
519-
options{
520-
timeout(time:6, unit:'HOURS')
521-
}
522-
environment {
523-
ACCNR = 'epic'
524-
NODE_PATH = '/work/noaa/epic/role-epic/'
525-
GITHUB_TOKEN = credentials('GithubJenkinsNew')
526-
}
527-
when{
528-
beforeAgent true
529-
expression { env.CHOICE_NODE == "orion" ? true : null }
530-
}
531-
steps{
532-
cleanWs()
533-
checkout scm
534-
sh '''
535-
git submodule update --init --recursive
536-
cd tests/fv3_conf
537-
sed 's/#SBATCH --time=.*/#SBATCH --time=02:00:00/g' -i fv3_slurm.IN_orion
538-
cd ..
539-
export machine=${NODE_NAME}
540-
export PATH=$PATH:~/bin
541-
export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
542-
export FORK_BRANCH=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.ref')
543-
export ACCNR=epic
544-
export GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
545-
export GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
546-
547-
pwd
548-
./opnReqTest -n cpld_control_nowave_noaero_p8 -a ${ACCNR} -c dbg,rst
549-
cd logs/
550-
# change "cp" to "mv" to be tighter on logfiles existence (prevents using logfiles from a previous run)
551-
mv OpnReqTests_cpld_control_nowave_noaero_p8_orion.log /work/noaa/epic/role-epic/jenkins/workspace/
552-
cd ..
553-
pwd
554-
'''
555-
} //steps
556-
} //stage
557-
558434
stage('control_p8'){
559435
agent{ label 'orion' }
560436
options{
@@ -635,14 +511,13 @@ stage('Run ORT on Ursa parallel'){
635511
# change "cp" to "mv" to be tighter on logfiles existence (prevents using logfiles from a previous run)
636512
mv OpnReqTests_control_p8_orion.log $WORKSPACE/tests/logs/
637513
mv OpnReqTests_regional_control_orion.log $WORKSPACE/tests/logs/
638-
mv OpnReqTests_cpld_control_nowave_noaero_p8_orion.log $WORKSPACE/tests/logs/
639514
cd $WORKSPACE/tests/
640515
git config user.email "ecc.platform@noaa.gov"
641516
git config user.name "epic-cicd-jenkins"
642517
export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }')
643518
git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
644519
git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
645-
git add logs/OpnReqTests_control_p8_orion.log logs/OpnReqTests_regional_control_orion.log logs/OpnReqTests_cpld_control_nowave_noaero_p8_orion.log
520+
git add logs/OpnReqTests_control_p8_orion.log logs/OpnReqTests_regional_control_orion.log
646521
git commit -m "ORT Jobs Completed.\n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"
647522
git pull sshorigin $FORK_BRANCH
648523
git push sshorigin HEAD:$FORK_BRANCH

0 commit comments

Comments
 (0)