File tree 1 file changed +12
-3
lines changed
buildbot.mariadb.org/scripts
1 file changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -89,18 +89,26 @@ wait_for_mariadb_upgrade() {
89
89
done
90
90
if (( res != 0 )) ; then
91
91
bb_log_err " mysql_upgrade or alike have not finished in reasonable time"
92
+ exit $res
92
93
fi
93
94
}
94
95
95
96
deb_setup_mariadb_mirror () {
96
97
# stop if any variable is undefined
97
98
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
+ }
99
103
bb_log_info " setup MariaDB repository for $1 branch"
100
- command -v wget > /dev/null ||
104
+ command -v wget > /dev/null || {
101
105
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 || {
103
109
bb_log_err " mariadb repository key installation failed"
110
+ exit 1
111
+ }
104
112
sudo sh -c " echo 'deb https://deb.mariadb.org/$1 /$dist_name $version_name main' >/etc/apt/sources.list.d/mariadb.list"
105
113
set +u
106
114
}
@@ -142,6 +150,7 @@ upgrade_test_type() {
142
150
;;
143
151
* )
144
152
log_bb_err " test type not provided"
153
+ exit 1
145
154
;;
146
155
esac
147
156
}
You can’t perform that action at this time.
0 commit comments