Skip to content

Commit

Permalink
Fix previous release detection
Browse files Browse the repository at this point in the history
The previous release detection mechanism was broken. Also since we do
not handle correctly when BB should do install and upgrade tests, let's
skip (by not failing) test that can't succeed since packages where not
released.
  • Loading branch information
fauust committed Oct 19, 2023
1 parent 2527b6b commit 241da9d
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions scripts/bash_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,16 @@ deb_setup_mariadb_mirror() {
bb_log_err "missing the branch variable"
exit 1
}
branch=$1
if [[ $branch == "$development_branch" ]]; then
#TOFIX - temp hack
prev_released=$((${branch/1[0-9]./} - 1))
if ((prev_released < 0)); then
branch="10.11"
else
branch="10.$prev_released"
fi
bb_log_info "using previous $branch released version for development branch $1"
branch_tmp=$1
major=${branch_tmp%.*}
minor=${branch_tmp##*.}
if [[ $branch_tmp == "11.0" ]]; then
prev_release="10.11"
else
prev_release="$major.$((minor - 1))"
fi
branch=$prev_release
bb_log_info "using previous $branch released version for development branch $1"
bb_log_info "setup MariaDB repository for $branch branch"
command -v wget >/dev/null || {
bb_log_err "wget command not found"
Expand All @@ -209,8 +208,12 @@ deb_setup_mariadb_mirror() {
exit 1
}
else
bb_log_err "deb_setup_mariadb_mirror: $branch packages for $dist_name $version_name does not exist on https://deb.mariadb.org/"
exit 1
# the correct way of handling this would be to not even start the check
# since we know it will always fail. But apparently, it's not going to
# happen soon in BB. Once done though, replace the warning with an error
# and use a non-zero exit code.
bb_log_warn "deb_setup_mariadb_mirror: $branch packages for $dist_name $version_name does not exist on https://deb.mariadb.org/"
exit 0
fi
set +u
}
Expand Down

0 comments on commit 241da9d

Please sign in to comment.