Skip to content

Commit b338bc1

Browse files
BruceKropp-RaytheonBruceKropp-Raytheon
committed
handle return condition on test scripts
Signed-off-by: Bruce Kropp <bruce.kropp@raytheon.com>
1 parent 6c8870c commit b338bc1

File tree

3 files changed

+29
-5
lines changed

3 files changed

+29
-5
lines changed

‎.cicd/scripts/create_baseline.sh

+15-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ function create_baseline() {
4141
[[ ${WM_OPERATIONAL_TESTS} = comprehensive ]] && opt="-l" && suite="rt.conf"
4242
[[ ${WM_OPERATIONAL_TESTS} = rt.conf ]] && opt="-l" && suite="rt.conf"
4343
[[ "${suite}" = rt.conf ]] && opt="-l"
44+
local status=0
4445

4546
git submodule update --init --recursive
4647
pwd
@@ -59,13 +60,15 @@ function create_baseline() {
5960
export dprefix=/lfs1/NAGAPE/$ACCNR/$USER
6061
sed 's|/lfs4/HFIP/${ACCNR}/${USER}|/lfs4/HFIP/hfv3gfs/${USER}|g' -i rt.sh
6162
./rt.sh -a ${ACCNR} -c -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
63+
status=${PIPESTATUS[0]}
6264
elif [[ $machine =~ "Hercules" ]]
6365
then
6466
echo "Creating baselines on $machine"
6567
export dprefix=/work2/noaa/$ACCNR/$USER
6668
sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
6769
export ACCNR=epic
6870
./rt.sh -a ${ACCNR} -c -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
71+
status=${PIPESTATUS[0]}
6972
export DISKNM=/work/noaa/epic/hercules/UFS-WM_RT
7073
cd ${DISKNM}/NEMSfv3gfs/
7174
mkdir -p develop-${BL_DATE}
@@ -76,6 +79,7 @@ function create_baseline() {
7679
chgrp noaa-hpc develop-${BL_DATE} || :
7780
cd $WORKSPACE/tests
7881
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
82+
status=${PIPESTATUS[0]}
7983
cd logs/
8084
cp RegressionTests_hercules.log $(dirname $WORKSPACE) #/work/noaa/epic/role-epic/jenkins/workspace
8185
git remote -v
@@ -97,6 +101,7 @@ function create_baseline() {
97101
sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
98102
export ACCNR=epic
99103
./rt.sh -a ${ACCNR} -c -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
104+
status=${PIPESTATUS[0]}
100105
export DISKNM=/work/noaa/epic/UFS-WM_RT
101106
cd ${DISKNM}/NEMSfv3gfs/
102107
mkdir -p develop-${BL_DATE}
@@ -107,6 +112,7 @@ function create_baseline() {
107112
chgrp noaa-hpc develop-${BL_DATE} || :
108113
cd $WORKSPACE/tests
109114
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
115+
status=${PIPESTATUS[0]}
110116
cd logs/
111117
cp RegressionTests_orion.log $(dirname $WORKSPACE) #/work/noaa/epic/role-epic/jenkins/workspace
112118
git remote -v
@@ -120,6 +126,7 @@ function create_baseline() {
120126
then
121127
echo "Creating baselines on $machine"
122128
./rt.sh -a ${ACCNR} -c -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
129+
status=${PIPESTATUS[0]}
123130
unset LD_LIBRARY_PATH
124131
export DISKNM=/gpfs/f5/epic/world-shared/UFS-WM_RT
125132
cd ${DISKNM}/NEMSfv3gfs/
@@ -130,6 +137,7 @@ function create_baseline() {
130137
chgrp ncep develop-${BL_DATE} || :
131138
cd $WORKSPACE/tests
132139
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
140+
status=${PIPESTATUS[0]}
133141
cd logs/
134142
cp RegressionTests_gaea.log $(dirname $WORKSPACE) #/gpfs/f5/epic/scratch/role.epic/jenkins/workspace
135143
git remote -v
@@ -145,13 +153,15 @@ function create_baseline() {
145153
export ACCNR=epic
146154
sed "s|QUEUE=batch|QUEUE=windfall|g" -i rt.sh
147155
./rt.sh -a ${ACCNR} -c -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
156+
status=${PIPESTATUS[0]}
148157
export DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT
149158
cd ${DISKNM}/NEMSfv3gfs/
150159
mkdir -p develop-${BL_DATE}
151160
cd /scratch1/NCEPDEV/stmp4/role.epic/FV3_RT
152161
ls -ld REGRESSION_TEST/. && rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
153162
cd $WORKSPACE/tests
154163
./rt.sh -a ${ACCNR} -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
164+
status=${PIPESTATUS[0]}
155165
cd logs/
156166
cp RegressionTests_hera.log $(dirname $WORKSPACE) #/scratch2/NAGAPE/epic/role.epic/jenkins/workspace
157167
git remote -v
@@ -166,13 +176,15 @@ function create_baseline() {
166176
echo "Creating baselines on $machine"
167177
export ACCNR=nral0032
168178
./rt.sh -a ${ACCNR} -c -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
179+
status=${PIPESTATUS[0]}
169180
export DISKNM=/glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/
170181
cd ${DISKNM}/NEMSfv3gfs/
171182
mkdir -p develop-${BL_DATE}
172183
cd /glade/derecho/scratch/epicufsrt/FV3_RT
173184
ls -ld REGRESSION_TEST/. && rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
174185
cd $WORKSPACE/tests
175186
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
187+
status=${PIPESTATUS[0]}
176188
cd logs/
177189
cp RegressionTests_derecho.log $(dirname $WORKSPACE) #/glade/derecho/scratch/epicufsrt/jenkins/workspace
178190
git remote -v
@@ -185,11 +197,13 @@ function create_baseline() {
185197
else
186198
echo "Creating baselines on $machine"
187199
./rt.sh -a ${ACCNR} -c -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
200+
status=${PIPESTATUS[0]}
188201
fi
189202

190203
cd ${WORKSPACE}
191204

192-
echo "Testing concluded for $machine"
205+
echo "Testing concluded for $machine. status=$status"
206+
return $status
193207
}
194208

195209
function post_test() {

‎.cicd/scripts/regression_test.sh

+10-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ function regression_test() {
4141
[[ ${WM_OPERATIONAL_TESTS} = comprehensive ]] && opt="-l" && suite="rt.conf"
4242
[[ ${WM_OPERATIONAL_TESTS} = rt.conf ]] && opt="-l" && suite="rt.conf"
4343
[[ "${suite}" = rt.conf ]] && opt="-l"
44+
local status=0
4445

4546
git submodule update --init --recursive
4647
pwd
@@ -59,13 +60,15 @@ function regression_test() {
5960
export dprefix=/lfs1/NAGAPE/$ACCNR/$USER
6061
sed 's|/lfs4/HFIP/${ACCNR}/${USER}|/lfs4/HFIP/hfv3gfs/${USER}|g' -i rt.sh
6162
./rt.sh -a ${ACCNR} -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
63+
status=${PIPESTATUS[0]}
6264
elif [[ $machine =~ "Hercules" ]]
6365
then
6466
echo "Running regression tests on $machine"
6567
export dprefix=/work2/noaa/$ACCNR/$USER
6668
sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
6769
export ACCNR=epic
6870
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
71+
status=${PIPESTATUS[0]}
6972
cd logs/
7073
cp RegressionTests_hercules.log $(dirname $WORKSPACE) #/work/noaa/epic/role-epic/jenkins/workspace
7174
git remote -v
@@ -86,6 +89,7 @@ function regression_test() {
8689
export dprefix=/work2/noaa/$ACCNR/$USER
8790
sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
8891
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
92+
status=${PIPESTATUS[0]}
8993
cd logs/
9094
cp RegressionTests_orion.log $(dirname $WORKSPACE) #/work/noaa/epic/role-epic/jenkins/workspace
9195
git remote -v
@@ -99,6 +103,7 @@ function regression_test() {
99103
then
100104
echo "Running regression tests on $machine"
101105
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
106+
status=${PIPESTATUS[0]}
102107
unset LD_LIBRARY_PATH
103108
cd logs/
104109
cp RegressionTests_gaea.log $(dirname $WORKSPACE) #/gpfs/f5/epic/scratch/role.epic/jenkins/workspace
@@ -115,6 +120,7 @@ function regression_test() {
115120
export ACCNR=epic
116121
sed "s|QUEUE=batch|QUEUE=windfall|g" -i rt.sh
117122
./rt.sh -a ${ACCNR} -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
123+
status=${PIPESTATUS[0]}
118124
cd logs/
119125
cp RegressionTests_hera.log $(dirname $WORKSPACE) #/scratch2/NAGAPE/epic/role.epic/jenkins/workspace
120126
git remote -v
@@ -129,6 +135,7 @@ function regression_test() {
129135
echo "Running regression tests on $machine"
130136
export ACCNR=nral0032
131137
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
138+
status=${PIPESTATUS[0]}
132139
cd logs/
133140
cp RegressionTests_derecho.log $(dirname $WORKSPACE) #/glade/derecho/scratch/epicufsrt/jenkins/workspace
134141
git remote -v
@@ -141,11 +148,13 @@ function regression_test() {
141148
else
142149
echo "Running regression tests on $machine"
143150
./rt.sh -a ${ACCNR} -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
151+
status=${PIPESTATUS[0]}
144152
fi
145153

146154
cd ${WORKSPACE}
147155

148-
echo "Testing concluded for $machine"
156+
echo "Testing concluded for $machine. status=$status"
157+
return $status
149158
}
150159

151160
function post_test() {

‎.cicd/scripts/wm_test.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ status=$?
5252

5353
rm -f ${workspace}/wm_test_results-${UFS_PLATFORM}-${UFS_COMPILER}.txt
5454
if [[ ${WM_REGRESSION_TESTS} = true ]] ; then
55+
echo "Pipeline Reqression Tests on ${UFS_PLATFORM} starting."
5556

5657
set +x
5758
if [[ ${UFS_PLATFORM} = orion ]] ; then
@@ -133,10 +134,10 @@ if [[ ${WM_REGRESSION_TESTS} = true ]] ; then
133134
egrep " DIRECTORY: |Time: | Completed: |Result: " logs/RegressionTests_${UFS_PLATFORM,,}.log | tee -a ${workspace}/wm_test_results-${UFS_PLATFORM}-${UFS_COMPILER}.txt
134135
egrep " -- COMPILE | -- TEST " logs/RegressionTests_${UFS_PLATFORM,,}.log | tee -a ${workspace}/wm_test_results-${UFS_PLATFORM}-${UFS_COMPILER}.txt
135136
cd ${workspace}
137+
find ${workspace}/tests/logs -ls
138+
echo "Pipeline Reqression Tests on ${UFS_PLATFORM} complete. status=$status"
136139
else
137-
echo "Pipeline skipping Regression Tests on ${UFS_PLATFORM} (${machine})"
140+
echo "Pipeline Regression Tests on ${UFS_PLATFORM} (${machine}) skipped."
138141
echo "ExperimentName: null" > ${workspace}/wm_test_results-${UFS_PLATFORM}-${UFS_COMPILER}.txt
139142
fi
140-
find ${workspace}/tests/logs -ls
141-
echo "Pipeline Tests on ${UFS_PLATFORM} complete. status=$status"
142143
exit $status

0 commit comments

Comments
 (0)