From c0ddc2c8cff30aebbedc5ae175e435c2c6fec646 Mon Sep 17 00:00:00 2001
From: rusher <diego.dupin@gmail.com>
Date: Fri, 28 Jul 2023 17:51:07 +0200
Subject: [PATCH] [misc] adding MariaDB server 11.1 and ES23.06 testing

---
 .travis.yml | 73 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70e6a041c..f4653e13e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,12 @@ install:
 
 env: local=0
 
+stages:
+  - Minimal
+  - name: Enterprise
+    if: type = push AND fork = false
+  - Community
+
 jobs:
   fast_finish: true
   allow_failures:
@@ -40,31 +46,62 @@ jobs:
     - env: srv=skysql
     - env: srv=skysql-ha
     - env: srv=xpand
-    - env: srv=mysql v=5.7 native=1
-    - env: srv=mysql v=8.0 native=1
+    - env: srv=mysql
   include:
-    - env: srv=mariadb v=10.11
+    - stage: Minimal
+      env: srv=mariadb v=10.6 packet=8
+      name: "CS 10.6"
+    - env: srv=mariadb-es
+      name: "ES latest"
+      if: type = push AND fork = false
+
+    - stage: Enterprise
+      env: srv=mariadb-es v=10.4
+      dist: bionic
+      name: "ES 10.4"
+    - env: srv=mariadb-es v=10.5
+      dist: bionic
+      name: "ES 10.5"
+    - env: srv=mariadb-es v=10.6
+      name: "ES 10.6"
+    - env: srv=mariadb-es-test v=23.06
+      name: "ES 23.06"
+    - env: srv=maxscale
+      name: "Maxscale"
+    - env: srv=xpand TEST_DB_OTHER="&initSql=SET NAMES UTF8"
+      name: "Xpand"
+    - env: srv=skysql
+      name: "SkySQL"
+    - env: srv=skysql-ha
+      name: "SkySQL with replication"
+    - env: srv=xpand
+      name: "Xpand"
+
+    - stage: Community
+      env: srv=mariadb v=10.11
       os: windows
       language: shell
     - env: srv=mariadb v=10.4 local=1
+      dist: bionic
+      name: "CS 10.4"
     - env: srv=mariadb v=10.5 local=1
-    - env: srv=mariadb v=10.6 local=1
+      dist: bionic
+      name: "CS 10.5"
+    - env: srv=mariadb v=10.9 local=1
+      name: "CS 10.9"
+    - env: srv=mariadb v=10.10 local=1
+      name: "CS 10.10"
     - env: srv=mariadb v=10.11 local=1
-    - if: type = push AND fork = false
-      env: srv=mariadb-es v=10.5
-    - if: type = push AND fork = false
-      env: srv=maxscale
-    - if: type = push AND fork = false
-      env: srv=xpand
-    - if: type = push AND fork = false
-      env: srv=build v=10.11
+      name: "CS 10.11"
+    - env: srv=mariadb v=10.11 local=1  TEST_OPTION=--ps-protocol
+      name: "CS 10.11 with ps-protocol"
+    - env: srv=mariadb v=11.0 local=1
+      name: "CS 11.0"
+    - env: srv=mariadb v=11.1-rc local=1
+      name: "CS 11.1"
     - env: srv=mysql v=5.7 native=1
+      name: "MySQL 5.7"
     - env: srv=mysql v=8.0 native=1
-    - if: type = push AND fork = false
-      env: srv=skysql
-    - if: type = push AND fork = false
-      env: srv=skysql-ha
-    - env: server_branch=10.11
-    - env: server_branch=10.11 TEST_OPTION=--ps-protocol
+      name: "MySQL 8.0"
 
 script: ./travis.sh