Skip to content

Commit 9480294

Browse files
committed
Fixed collection of masterfiles acceptance test results
Was guarded by an "if nova" condition which is incorrect. We test masterfiles in community builds so need them always. Ticket: ENT-13515 Changelog: none
1 parent 4a2a7c8 commit 9480294

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

build-scripts/test-on-testmachine

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@ rsync -rv $INCLUDES --exclude="*" \
110110
"$BASEDIR"/core/tests/acceptance/ \
111111
>>/tmp/rsync.log
112112

113+
log_debug "Collecting test results from masterfiles repo..."
114+
# shellcheck disable=SC2086
115+
# > Double quote to prevent globbing and word splitting.
116+
# We want word splitting
117+
rsync -rv $INCLUDES --exclude="*" \
118+
"$TESTMACHINE_URI$BASEDIR"/masterfiles/tests/acceptance/ \
119+
"$BASEDIR"/masterfiles/tests/acceptance/ \
120+
>>/tmp/rsync.log
121+
113122
if [ "$PROJECT" = nova ]; then
114123
log_debug "Collecting test results from enterprise repo..."
115124
# shellcheck disable=SC2086
@@ -119,14 +128,6 @@ if [ "$PROJECT" = nova ]; then
119128
"$TESTMACHINE_URI$BASEDIR"/enterprise/tests/acceptance/ \
120129
"$BASEDIR"/enterprise/tests/acceptance/ \
121130
>>/tmp/rsync.log
122-
log_debug "Collecting test results from masterfiles repo..."
123-
# shellcheck disable=SC2086
124-
# > Double quote to prevent globbing and word splitting.
125-
# We want word splitting
126-
rsync -rv $INCLUDES --exclude="*" \
127-
"$TESTMACHINE_URI$BASEDIR"/masterfiles/tests/acceptance/ \
128-
"$BASEDIR"/masterfiles/tests/acceptance/ \
129-
>>/tmp/rsync.log
130131
fi
131132

132133
if [ $return_code -ne 0 ]; then

0 commit comments

Comments
 (0)