Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"12.1",
"12.2",
"12.3",
"13.0",
"main",
]

Expand Down Expand Up @@ -231,7 +232,8 @@
SUPPORTED_PLATFORMS["12.1"] = SUPPORTED_PLATFORMS["12.0"].copy()
SUPPORTED_PLATFORMS["12.2"] = SUPPORTED_PLATFORMS["12.1"].copy()
SUPPORTED_PLATFORMS["12.3"] = SUPPORTED_PLATFORMS["12.2"].copy()
SUPPORTED_PLATFORMS["main"] = SUPPORTED_PLATFORMS["12.3"].copy()
SUPPORTED_PLATFORMS["13.0"] = SUPPORTED_PLATFORMS["12.3"].copy()
SUPPORTED_PLATFORMS["main"] = SUPPORTED_PLATFORMS["13.0"].copy()

# Define environment variables for MTR step
MTR_ENV = {
Expand Down
2 changes: 2 additions & 0 deletions master-web/templates/grid_view/grid.jade
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
| ,
a(href="#grid?branch=12.3") 12.3
| ,
a(href="#grid?branch=13.0") 13.0
| ,
a(href="#grid?branch=main") main
| ,
a(href="#grid?branch=mariadb-4.x") mariadb-4.x (galera)
Expand Down
2 changes: 2 additions & 0 deletions master-web/templates/home.jade
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
| ,
a(href="#grid?branch=12.3") 12.3
| ,
a(href="#grid?branch=13.0") 13.0
| ,
a(href="#grid?branch=main") main
| ,
a(href="#grid?branch=mariadb-4.x") mariadb-4.x (galera)
Expand Down
8 changes: 8 additions & 0 deletions scripts/bash_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,8 @@ upgrade_test_type() {
prev_major_version="10.11"
elif ((major == 12)); then
prev_major_version="11.8"
elif ((major == 13)); then
prev_major_version="12.3"
else
bb_log_err "Unknown previous branch for $branch_tmp, please update this script"
exit 1
Expand Down Expand Up @@ -635,6 +637,12 @@ check_upgraded_versions() {
diff -u /tmp/version.old /tmp/version.new
exit 1
fi
elif ((old_branch_digit == 12)) && ((old_major_digit == 3)); then
if ((new_branch_digit == 13)) && ((new_major_digit != 0)); then
bb_log_err "This does not look like a major upgrade from 12.3 to 13.0:"
diff -u /tmp/version.old /tmp/version.new
exit 1
fi
else
old_major_digit_incr=$((old_major_digit + 1))
((old_major_digit_incr == new_major_digit)) || {
Expand Down