Skip to content

Commit c6b7412

Browse files
committed
fixup! bb.org: missing env var should make the script end imediately
1 parent 1186a4d commit c6b7412

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

buildbot.mariadb.org/scripts/bash_lib.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,26 @@ wait_for_mariadb_upgrade() {
8989
done
9090
if ((res != 0)); then
9191
bb_log_err "mysql_upgrade or alike have not finished in reasonable time"
92+
exit $res
9293
fi
9394
}
9495

9596
deb_setup_mariadb_mirror() {
9697
# stop if any variable is undefined
9798
set -u
98-
[[ -n $1 ]] || bb_log_err "missing the branch variable"
99+
[[ -n $1 ]] || {
100+
bb_log_err "missing the branch variable"
101+
exit 1
102+
}
99103
bb_log_info "setup MariaDB repository for $1 branch"
100-
command -v wget >/dev/null ||
104+
command -v wget >/dev/null || {
101105
bb_log_err "wget command not found"
102-
sudo wget https://mariadb.org/mariadb_release_signing_key.asc -O /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc ||
106+
exit 1
107+
}
108+
sudo wget https://mariadb.org/mariadb_release_signing_key.asc -O /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc || {
103109
bb_log_err "mariadb repository key installation failed"
110+
exit 1
111+
}
104112
sudo sh -c "echo 'deb https://deb.mariadb.org/$1/$dist_name $version_name main' >/etc/apt/sources.list.d/mariadb.list"
105113
set +u
106114
}
@@ -142,6 +150,7 @@ upgrade_test_type() {
142150
;;
143151
*)
144152
log_bb_err "test type not provided"
153+
exit 1
145154
;;
146155
esac
147156
}

0 commit comments

Comments
 (0)