removed gcc-8_i386 from ci (droped 32bit support)

1 files changed, 122 insertions, 187 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 684f316f7..98090993e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,143 +34,127 @@ variables: &base_vars
 
 # Compilers
 
-.re:clang-3.9:
+re:clang-6.0:
   <<: *branch_exceptions
   <<: *prerequisites
-  stage: primary
-  image: debian:stretch
+  stage: secondary
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-6.0 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot
+    - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.zero-2018:clang-3.9:
+zero-2018:clang-6.0:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
-  image: debian:stretch
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-6.0 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
+    - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.re:clang-4.0:
+re:clang-7:
   <<: *branch_exceptions
   <<: *prerequisites
-  stage: secondary
-  image: debian:stretch
+  stage: primary
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-7 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot
+    - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.zero-2018:clang-4.0:
+zero-2018:clang-7:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
-  image: debian:stretch
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-7 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
+    - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.re:clang-5.0:
+.pre_re:clang-8:
   <<: *branch_exceptions
-  before_script:
-    - echo "Building $CI_BUILD_NAME"
-    - uname -a
-    - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list
-    - ./tools/ci/retry.sh apt-get update
-    - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0
-    - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES
-#    - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST
-#    - ./tools/ci/travis.sh getplugins || true
+  <<: *prerequisites
   stage: secondary
-  image: debian:stretch
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot
-#    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
+    - ./tools/ci/travis.sh build CC=clang-8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
+    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.zero-2018:clang-5.0:
+.re:clang-8:
   <<: *branch_exceptions
-  before_script:
-    - echo "Building $CI_BUILD_NAME"
-    - uname -a
-    - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list
-    - ./tools/ci/retry.sh apt-get update
-    - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0
-    - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES
-#    - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST
-#    - ./tools/ci/travis.sh getplugins || true
-  stage: clients
-  image: debian:stretch
+  <<: *prerequisites
+  stage: secondary
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
-#    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
+    - ./tools/ci/travis.sh build CC=clang-8 --enable-debug --enable-Werror --enable-buildbot
+    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.re:clang-6.0:
+.zero-2018:clang-8:
   <<: *branch_exceptions
   <<: *prerequisites
-  stage: primary
-  image: debian:unstable
+  stage: clients
+  image: debian:buster
   services:
     - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-6.0 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot
+    - ./tools/ci/travis.sh build CC=clang-8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.zero-2018:clang-6.0:
+pre_re:clang-11:
   <<: *branch_exceptions
   <<: *prerequisites
-  stage: clients
+  stage: secondary
   image: debian:unstable
   services:
     - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-6.0 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-11 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
+    - ./tools/ci/travis.sh build CC=clang-11 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.re:clang-7:
+re:clang-11:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
@@ -179,13 +163,13 @@ variables: &base_vars
     - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-7 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-11 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot
+    - ./tools/ci/travis.sh build CC=clang-11 --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.zero-2018:clang-7:
+zero-2018:clang-11:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
@@ -194,13 +178,14 @@ variables: &base_vars
     - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: clang-7 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: clang-11 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
+    - ./tools/ci/travis.sh build CC=clang-11 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.pre_re:gcc-4.8:
+
+pre_re:gcc-4.8:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
@@ -215,7 +200,7 @@ variables: &base_vars
     - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.re:gcc-4.8:
+re:gcc-4.8:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
@@ -230,7 +215,7 @@ variables: &base_vars
     - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.zero-2018:gcc-4.8:
+zero-2018:gcc-4.8:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
@@ -245,10 +230,10 @@ variables: &base_vars
     - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.re:gcc-4.9:
+re:gcc-4.9:
   <<: *branch_exceptions
   <<: *prerequisites
-  stage: primary
+  stage: secondary
   image: debian:jessie
   services:
     - mysql:5.5
@@ -260,7 +245,7 @@ variables: &base_vars
     - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.zero-2018:gcc-4.9:
+zero-2018:gcc-4.9:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
@@ -338,7 +323,7 @@ zero-2018:gcc-7:
 re:gcc-8:
   <<: *branch_exceptions
   <<: *prerequisites
-  stage: secondary
+  stage: primary
   image: debian:buster
   services:
     - mariadb:10
@@ -354,7 +339,7 @@ zero-2018:gcc-8:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
-  image: debian:unstable
+  image: debian:buster
   services:
     - mariadb:10
   variables:
@@ -365,114 +350,114 @@ zero-2018:gcc-8:
     - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
 #   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-re:gcc-6_i386:
+.re:gcc-8_i386:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: primary
   image: i386/debian:stretch
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot
+    - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot
 #   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-zero-2018:gcc-6_i386:
+.zero-2018:gcc-8_i386:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
   image: i386/debian:stretch
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
+    - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
 #   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-re:gcc-6_sanitize:
+re:gcc-8_sanitize:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
-  image: debian:stretch
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full
+    - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full
 #   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-zero-2018:gcc-6_sanitize:
+zero-2018:gcc-8_sanitize:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
-  image: debian:stretch
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511
+    - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511
 #   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-re:gcc-6_i386_sanitize:
+.re:gcc-8_i386_sanitize:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
   image: i386/debian:stretch
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full
+    - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full
 #   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-zero-2018:gcc-6_i386_sanitize:
+.zero-2018:gcc-8_i386_sanitize:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
   image: i386/debian:stretch
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511
+    - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511
 #   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-re:gcc-6_cov:
+re:gcc-8_cov:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
-  image: debian:stretch
+  image: debian:buster
   services:
-    - mariadb:10.1
+    - mariadb:10
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat
+    INSTALL_PACKAGES: gcc-8 gcovr mariadb-client libmariadbclient-dev-compat
     SQLHOST: mariadb
   script:
-    - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot CFLAGS="-coverage" LDFLAGS="-coverage"
-#   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-#   - gcovr -r . --gcov-executable=gcov-6 -o gcov_re.txt
-#   - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_re.html
-#   - cat gcov_re.txt
-# artifacts:
+    - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot CFLAGS="-coverage" LDFLAGS="-coverage"
+#    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
+#    - gcovr -r . --gcov-executable=gcov-8 -o gcov_re.txt
+#    - gcovr -r . --gcov-executable=gcov-8 --html -o gcov_re.html
+#    - cat gcov_re.txt
+#  artifacts:
 #    paths:
 #      - gcov_re.*
 #    when: on_success
@@ -485,11 +470,11 @@ re:debian-oldstable:
   stage: platforms
   image: debian:oldstable
   services:
-    - mysql:5.5
+    - mariadb:10.1
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev
-    SQLHOST: mysql
+    INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat
+    SQLHOST: mariadb
   script:
     - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
@@ -500,7 +485,7 @@ re:debian-stable:
   stage: platforms
   image: debian:stable
   services:
-    - mariadb:10.1
+    - mariadb:10.3
   variables:
     <<: *base_vars
     INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat
@@ -515,7 +500,7 @@ re:debian-testing:
   stage: platforms
   image: debian:testing
   services:
-    - mariadb:10.1
+    - mariadb:10.3
   variables:
     <<: *base_vars
     INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat
@@ -523,49 +508,7 @@ re:debian-testing:
   script:
     - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
 
-.re:centos-previous:
-  <<: *branch_exceptions
-  stage: platforms
-  image: centos:6
-  services:
-    - mysql:5.5
-  variables:
-    <<: *base_vars
-    SQLHOST: mysql
-  before_script:
-    - echo "Building $CI_BUILD_NAME"
-    - uname -a
-    - yum -y update
-    - yum install -y make mysql-devel pcre-devel git zlib-devel mysql
-    - yum install -y centos-release-scl
-    - yum install -y yum install devtoolset-3-toolchain
-#    - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST
-#    - ./tools/ci/travis.sh getplugins || true
-  script:
-    - scl enable devtoolset-3  './tools/ci/travis.sh build CFLAGS="-Wno-cast-qual" --enable-debug --enable-Werror --enable-buildbot'
-#    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-.re:centos-current:
-  <<: *branch_exceptions
-  stage: platforms
-  image: centos:7
-  services:
-    - mariadb:5.5
-  before_script:
-    - echo "Building $CI_BUILD_NAME"
-    - uname -a
-    - yum -y update
-    - yum install -y gcc make mariadb-devel pcre-devel git zlib-devel mariadb
-#    - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST
-#    - ./tools/ci/travis.sh getplugins || true
-  variables:
-    <<: *base_vars
-    SQLHOST: mariadb
-  script:
-    - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
-#    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-.re:ubuntu-xenial:
+re:ubuntu-xenial:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: platforms
@@ -642,16 +585,16 @@ re:mysql-5.6:
     - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-re:mysql-5.7:
+re:mysql-8.0:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: platforms
   image: debian:unstable
   services:
-    - mysql:5.7
+    - mysql:8.0
   variables:
     <<: *base_vars
-    INSTALL_PACKAGES: gcc mysql-client-5.7 libmysqlclient-dev
+    INSTALL_PACKAGES: gcc mysql-client-8.0 libmysqlclient-dev
     SQLHOST: mysql
   script:
     - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
@@ -687,6 +630,21 @@ re:mariadb-10.1:
     - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
+re:mariadb-10.3:
+  <<: *branch_exceptions
+  <<: *prerequisites
+  stage: platforms
+  image: debian:buster
+  services:
+    - mariadb:10.3
+  variables:
+    <<: *base_vars
+    INSTALL_PACKAGES: gcc mariadb-client-10.3 libmariadbclient-dev-compat
+    SQLHOST: mariadb
+  script:
+    - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
+#   - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
+
 re:mariadb-latest:
   <<: *branch_exceptions
   <<: *prerequisites
@@ -702,7 +660,7 @@ re:mariadb-latest:
     - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-.re:percona:
+re:percona:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: platforms
@@ -717,26 +675,3 @@ re:mariadb-latest:
     - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
 #    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-# Documentation
-#pages:
-#  only:
-#    - master
-#  stage: extras
-#  image: debian:unstable
-#  before_script:
-#    - echo "Building $CI_BUILD_NAME"
-#    - uname -a
-#    - ./tools/ci/retry.sh apt-get update
-#    - ./tools/ci/retry.sh apt-get install -y -qq gcc $DEBIAN_COMMON_PACKAGES libmysqlclient-dev doxygen graphviz
-#  script:
-#    - ./configure
-#    - make docs
-#    - mkdir public
-#    - mv tools/doxygen/docs/html public/docs
-#    - mv gcov_*.* public/
-#    - cp tools/doxygen/pages_index.html public/index.html
-#  dependencies:
-#    - re:gcc-6_cov
-#  artifacts:
-#    paths:
-#      - public