From d96114f0682afbe7dceac4e87844a4589a152444 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 16 Jun 2022 13:35:13 +0300
Subject: [PATCH] MDEV-28628: new debian package version name

---
 scripts/docker-library-build-and-test.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/scripts/docker-library-build-and-test.sh b/scripts/docker-library-build-and-test.sh
index ba9a75b5..1e6d3b5f 100755
--- a/scripts/docker-library-build-and-test.sh
+++ b/scripts/docker-library-build-and-test.sh
@@ -46,12 +46,11 @@ container_tag=${container_tag,,*}
 case "${buildername#*ubuntu-}" in
   2204-deb-autobake)
     base=jammy
+    pkgver=ubu2204
     ;;
   2004-deb-autobake)
     base=focal
-    ;;
-  1804-deb-autobake)
-    base=bionic
+    pkgver=ubu2204
     ;;
   *)
     echo "unknown base buildername $buildername"
@@ -59,6 +58,17 @@ case "${buildername#*ubuntu-}" in
     ;;
 esac
 
+# gradually exclude for other major version as
+# https://github.com/MariaDB/server/commit/c168e16782fc449f61412e5afc1c01d59b77c675
+# is merged up.
+case "$container_tag" in
+  10.3)
+    ;;
+  *)
+    pkgver=$base
+    ;;
+esac
+
 buildernamebase=${buildername#*-}
 builderarch=${buildername%%-*}
 
@@ -87,7 +97,7 @@ build() {
   shift
   t=$(mktemp)
   buildah bud --layers "$@" --build-arg REPOSITORY="[trusted=yes] https://ci.mariadb.org/$tarbuildnum/${arch}-${buildernamebase}/debs ./" \
-    --build-arg MARIADB_VERSION="1:$mariadb_version+maria~$base" \
+    --build-arg MARIADB_VERSION="1:$mariadb_version+maria~$pkgver" \
     "${annotations[@]}" \
     "mariadb-docker/$master_branch" | tee "${t}"
   image=$(tail -n 1 "$t")