Merge pull request #178 from mariadb-corporation/3.2-diego

test various correction - 3.2 branch

.travis.yml

@@ -1,48 +1,68 @@
-sudo: true
+os: linux
+dist: focal
 language: c
-cache:
-  apt: true
-  ccache: true
 services: docker
-
 addons:
   hosts:
     - mariadb.example.com
 
-before_script:
-  # Disable services enabled by default
-  - sudo /etc/init.d/mysql stop
+cache:
+  apt: true
+  ccache: true
+  directories:
+    - $HOME/docker
 
 before_install:
-  - chmod -R +x .travis/*
-  - chmod 777 .travis/build/
-  - export PROJ_PATH=`pwd`
-  - export ENTRYPOINT=$PROJ_PATH/.travis/sql
-  - mkdir tmp
-  - .travis/gen-ssl.sh mariadb.example.com tmp
-  - export SSLCERT=$PROJ_PATH/tmp
-matrix:
+  - git clone https://github.com/mariadb-corporation/connector-test-machine.git
+  # Load cached docker images
+  - if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi
+
+install:
+  - |-
+    if [ -z "$server_branch" ] ; then
+      case $TRAVIS_OS_NAME in
+        windows)
+          connector-test-machine/launch.bat -t "$srv" -v "$v" -d testc
+          ;;
+        linux)
+          source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testc -l "$local" -n "$native"
+          ;;
+      esac
+    fi
+
+
+env: local=0
+
+jobs:
+  fast_finish: true
   allow_failures:
-    - env: SERVER_BRANCH=10.6
-    - env: SERVER_BRANCH=10.6 TEST_OPTION=--ps-protocol
-    - env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
+    - env: srv=build v=10.6
+    - env: srv=mariadb v=10.5
+      os: windows
+      language: shell
   include:
-    - env: SKYSQL=true
-# disable for now    - env: DB=mysql:8.0
-# eoled    - env: DB=mariadb:10.1
-    - env: DB=mariadb:10.2
-    - env: DB=mariadb:10.3
-    - env: DB=mariadb:10.4
-    - env: DB=mariadb:10.5
-    - env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
-    - env: DB=mariadb:10.5 MAXSCALE_VERSION=2.5.3 MAXSCALE_TEST_DISABLE=true
-    - env: DB=build:10.6
-    - env: SERVER_BRANCH=10.6
-    - env: SERVER_BRANCH=10.6 TEST_OPTION=--ps-protocol
-
-script:
-  - if [[ "$DB" == build* ]] ; then .travis/build/build.sh; fi
-  - if [[ "$DB" == build* ]] ; then docker build -t build:10.6 --label build .travis/build/; fi
-  - if [ -z "$DB" ] && [ -z "$SKYSQL" ] && [ -z "$SKYSQL_HA" ] ; then .travis/server-replace-submodule.sh; fi
-  - if [ -n "$DB" ] || [ -n "$SKYSQL" ] || [ -n "$SKYSQL_HA" ]; then .travis/script.sh; fi
+    - env: srv=mariadb v=10.5
+      os: windows
+      language: shell
+    - env: srv=mariadb v=10.2 local=1
+      dist: bionic
+    - env: srv=mariadb v=10.3 local=1
+    - env: srv=mariadb v=10.4 local=1
+    - env: srv=mariadb v=10.5 local=1
+    - env: srv=mariadb v=10.6 local=1
+    - if: env(CONNECTOR_TEST_SECRET_KEY)
+      env: srv=mariadb-es v=10.5
+    - if: env(CONNECTOR_TEST_SECRET_KEY)
+      env: srv=maxscale
+    - if: env(CONNECTOR_TEST_SECRET_KEY)
+      env: srv=build v=10.6
+    - env: srv=mysql v=5.7 native=1
+    - env: srv=mysql v=8.0 native=1
+    - if: env(CONNECTOR_TEST_SECRET_KEY)
+      env: srv=skysql
+    - if: env(CONNECTOR_TEST_SECRET_KEY)
+      env: srv=skysql-ha
+    - env: server_branch=10.6
+    - env: server_branch=10.6 TEST_OPTION=--ps-protocol
 
+script: ./travis.sh