Skip to content

Commit 4d2bca2

Browse files
BruceKropp-RaytheonBruceKropp-Raytheon
committed
report error for missing REGRESSION_TEST/
Signed-off-by: Bruce Kropp <bruce.kropp@raytheon.com>
1 parent b338bc1 commit 4d2bca2

File tree

2 files changed

+52
-43
lines changed

2 files changed

+52
-43
lines changed

‎.cicd/scripts/create_baseline.sh

+31-24
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
#!/bin/bash -x
2-
set -eu
32

3+
export PATH=$PATH:~/bin
44
echo "USER=${USER}"
55
echo "WORKSPACE=${WORKSPACE}"
6-
export machine=${NODE_NAME}
76
export ACCNR=epic
87

8+
export account="-a ${ACCNR}"
9+
export workflow="-e"
10+
#[[ ${UFS_PLATFORM} = jet ]] && workflow="-r"
11+
#[[ ${UFS_PLATFORM} = hera ]] && workflow="-r"
12+
#[[ ${UFS_PLATFORM} =~ clusternoaa ]] && workflow=""
13+
14+
export opt="-l"
15+
export suite="rt.conf"
16+
[[ -n ${WM_OPERATIONAL_TESTS} ]] && opt="-n" && suite="${WM_OPERATIONAL_TESTS} ${UFS_COMPILER}" || return 0
17+
[[ ${WM_OPERATIONAL_TESTS} = default ]] && opt="-n" && suite="control_p8 ${UFS_COMPILER}"
18+
[[ ${WM_OPERATIONAL_TESTS} = comprehensive ]] && opt="-l" && suite="rt.conf"
19+
[[ ${WM_OPERATIONAL_TESTS} = rt.conf ]] && opt="-l" && suite="rt.conf"
20+
[[ "${suite}" = rt.conf ]] && opt="-l"
21+
22+
set -eu
23+
24+
export machine=${NODE_NAME}
25+
926
SCRIPT_REALPATH=$(realpath "${BASH_SOURCE[0]}")
1027
SCRIPTS_DIR=$(dirname "${SCRIPT_REALPATH}")
1128
UFS_MODEL_DIR=$(realpath "${SCRIPTS_DIR}/../..")
@@ -24,23 +41,8 @@ ls -al .cicd/*
2441
ls -al ${TESTS_DIR}/rt.sh
2542

2643
function create_baseline() {
27-
export machine=${NODE_NAME}
28-
export PATH=$PATH:~/bin
44+
local machine=${1:-${NODE_NAME}}
2945
local WORKSPACE="$(pwd)"
30-
31-
account="-a ${ACCNR}"
32-
workflow="-e"
33-
#[[ ${UFS_PLATFORM} = jet ]] && workflow="-r"
34-
#[[ ${UFS_PLATFORM} = hera ]] && workflow="-r"
35-
#[[ ${UFS_PLATFORM} =~ clusternoaa ]] && workflow=""
36-
37-
opt="-l"
38-
suite="rt.conf"
39-
[[ -n ${WM_OPERATIONAL_TESTS} ]] && opt="-n" && suite="${WM_OPERATIONAL_TESTS} ${UFS_COMPILER}" || return 0
40-
[[ ${WM_OPERATIONAL_TESTS} = default ]] && opt="-n" && suite="control_p8 ${UFS_COMPILER}"
41-
[[ ${WM_OPERATIONAL_TESTS} = comprehensive ]] && opt="-l" && suite="rt.conf"
42-
[[ ${WM_OPERATIONAL_TESTS} = rt.conf ]] && opt="-l" && suite="rt.conf"
43-
[[ "${suite}" = rt.conf ]] && opt="-l"
4446
local status=0
4547

4648
git submodule update --init --recursive
@@ -73,7 +75,8 @@ function create_baseline() {
7375
cd ${DISKNM}/NEMSfv3gfs/
7476
mkdir -p develop-${BL_DATE}
7577
cd /work2/noaa/epic/stmp/role-epic/stmp/role-epic/FV3_RT
76-
ls -ld REGRESSION_TEST/. && rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
78+
ls -l REGRESSION_TEST/.
79+
rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
7780
cd ${DISKNM}/NEMSfv3gfs/
7881
./adjust_permissions.sh hercules develop-${BL_DATE} || :
7982
chgrp noaa-hpc develop-${BL_DATE} || :
@@ -106,7 +109,8 @@ function create_baseline() {
106109
cd ${DISKNM}/NEMSfv3gfs/
107110
mkdir -p develop-${BL_DATE}
108111
cd /work/noaa/epic/stmp/role-epic/stmp/role-epic/FV3_RT/
109-
ls -ld REGRESSION_TEST/. && rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
112+
ls -l REGRESSION_TEST/.
113+
rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
110114
cd ${DISKNM}/NEMSfv3gfs/
111115
./adjust_permissions.sh orion develop-${BL_DATE} || :
112116
chgrp noaa-hpc develop-${BL_DATE} || :
@@ -132,7 +136,8 @@ function create_baseline() {
132136
cd ${DISKNM}/NEMSfv3gfs/
133137
mkdir -p develop-${BL_DATE}
134138
cd /gpfs/f5/epic/scratch/role.epic/FV3_RT
135-
ls -ld REGRESSION_TEST/. && rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
139+
ls -l REGRESSION_TEST/.
140+
rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
136141
cd ${DISKNM}/NEMSfv3gfs/
137142
chgrp ncep develop-${BL_DATE} || :
138143
cd $WORKSPACE/tests
@@ -158,7 +163,8 @@ function create_baseline() {
158163
cd ${DISKNM}/NEMSfv3gfs/
159164
mkdir -p develop-${BL_DATE}
160165
cd /scratch1/NCEPDEV/stmp4/role.epic/FV3_RT
161-
ls -ld REGRESSION_TEST/. && rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
166+
ls -l REGRESSION_TEST/.
167+
rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
162168
cd $WORKSPACE/tests
163169
./rt.sh -a ${ACCNR} -r ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
164170
status=${PIPESTATUS[0]}
@@ -181,7 +187,8 @@ function create_baseline() {
181187
cd ${DISKNM}/NEMSfv3gfs/
182188
mkdir -p develop-${BL_DATE}
183189
cd /glade/derecho/scratch/epicufsrt/FV3_RT
184-
ls -ld REGRESSION_TEST/. && rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
190+
ls -l REGRESSION_TEST/.
191+
rsync -a --no-t REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE} || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
185192
cd $WORKSPACE/tests
186193
./rt.sh -a ${ACCNR} -e ${opt} "${suite}" | tee $WORKSPACE/tests/logs/RT-run-$machine.log
187194
status=${PIPESTATUS[0]}
@@ -231,4 +238,4 @@ function post_test() {
231238
#curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/$machine-BL
232239
}
233240

234-
create_baseline
241+
create_baseline ${machine}

‎.cicd/scripts/regression_test.sh

+21-19
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
#!/bin/bash -x
2-
set -eu
32

3+
export PATH=$PATH:~/bin
44
echo "USER=${USER}"
55
echo "WORKSPACE=${WORKSPACE}"
6-
export machine=${NODE_NAME}
76
export ACCNR=epic
87

8+
export account="-a ${ACCNR}"
9+
export workflow="-e"
10+
#[[ ${UFS_PLATFORM} = jet ]] && workflow="-r"
11+
#[[ ${UFS_PLATFORM} = hera ]] && workflow="-r"
12+
#[[ ${UFS_PLATFORM} =~ clusternoaa ]] && workflow=""
13+
14+
export opt="-l"
15+
export suite="rt.conf"
16+
[[ -n ${WM_OPERATIONAL_TESTS} ]] && opt="-n" && suite="${WM_OPERATIONAL_TESTS} ${UFS_COMPILER}" || return 0
17+
[[ ${WM_OPERATIONAL_TESTS} = default ]] && opt="-n" && suite="control_p8 ${UFS_COMPILER}"
18+
[[ ${WM_OPERATIONAL_TESTS} = comprehensive ]] && opt="-l" && suite="rt.conf"
19+
[[ ${WM_OPERATIONAL_TESTS} = rt.conf ]] && opt="-l" && suite="rt.conf"
20+
[[ "${suite}" = rt.conf ]] && opt="-l"
21+
22+
set -eu
23+
24+
export machine=${NODE_NAME}
25+
926
SCRIPT_REALPATH=$(realpath "${BASH_SOURCE[0]}")
1027
SCRIPTS_DIR=$(dirname "${SCRIPT_REALPATH}")
1128
UFS_MODEL_DIR=$(realpath "${SCRIPTS_DIR}/../..")
@@ -24,23 +41,8 @@ ls -al .cicd/*
2441
ls -al ${TESTS_DIR}/rt.sh
2542

2643
function regression_test() {
27-
export machine=${NODE_NAME}
28-
export PATH=$PATH:~/bin
44+
local machine=${1:-${NODE_NAME}}
2945
local WORKSPACE="$(pwd)"
30-
31-
account="-a ${ACCNR}"
32-
workflow="-e"
33-
#[[ ${UFS_PLATFORM} = jet ]] && workflow="-r"
34-
#[[ ${UFS_PLATFORM} = hera ]] && workflow="-r"
35-
#[[ ${UFS_PLATFORM} =~ clusternoaa ]] && workflow=""
36-
37-
opt="-l"
38-
suite="rt.conf"
39-
[[ -n ${WM_OPERATIONAL_TESTS} ]] && opt="-n" && suite="${WM_OPERATIONAL_TESTS} ${UFS_COMPILER}" || return 0
40-
[[ ${WM_OPERATIONAL_TESTS} = default ]] && opt="-n" && suite="control_p8 ${UFS_COMPILER}"
41-
[[ ${WM_OPERATIONAL_TESTS} = comprehensive ]] && opt="-l" && suite="rt.conf"
42-
[[ ${WM_OPERATIONAL_TESTS} = rt.conf ]] && opt="-l" && suite="rt.conf"
43-
[[ "${suite}" = rt.conf ]] && opt="-l"
4446
local status=0
4547

4648
git submodule update --init --recursive
@@ -182,4 +184,4 @@ function post_test() {
182184
#curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/$machine-RT
183185
}
184186

185-
regression_test
187+
regression_test ${machine}

0 commit comments

Comments
 (0)