Skip to content

Commit 980b827

Browse files
Address review comments
1 parent 9bc7c57 commit 980b827

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

master-libvirt/master.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@ for builder_name in BUILDERS_INSTALL:
267267
properties={
268268
"systemdCapability": "yes",
269269
"needsGalera": "yes",
270-
"dist_name": os_name,
271-
"version_name": OS_INFO[os_info_name]["version_name"],
272-
"arch": build_arch,
273270
"test_mode": "server",
274271
"test_type": "distro",
275272
"BB_CI": True,

scripts/bash_lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ deb_setup_mariadb_mirror() {
244244
exit 1
245245
}
246246
[[ $1 == "N/A" ]] && {
247-
bb_log_warn "performing a distribution upgrade, skipping repository setup"
247+
bb_log_info "performing a distribution upgrade, skipping repository setup"
248248
set +u
249249
return 0
250250
}
@@ -254,7 +254,7 @@ deb_setup_mariadb_mirror() {
254254
bb_log_err "wget command not found"
255255
exit 1
256256
}
257-
#//TEMP it's probably better to install the last stable release here...?
257+
258258
source /etc/os-release
259259

260260
if [ "${PRETTY_NAME##*/}" == "sid" ]; then

scripts/deb-upgrade.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ bb_print_env
2525
# - 'deps' -- only a limited set of main packages is installed and upgraded,
2626
# to make sure upgrade does not require new dependencies
2727
# - 'columnstore' -- mariadb-server and mariadb-plugin-columnstore are installed
28+
29+
# And there are three upgrade types:
30+
# - 'minor' -- upgrade within the same major version, e.g. 10.5.x to 10.5.y
31+
# - 'major' -- upgrade to the next major version, e.g. 10.x to 10.y
32+
# - 'distro' -- upgrade from the version provided by the distro
33+
2834
bb_log_info "Current test mode: $test_mode"
2935

3036
set -x

0 commit comments

Comments
 (0)