Skip to content

Commit 7e44cb3

Browse files
committed
[R2DBC-18] Update CI to use common Connector testing script.
Add SkySQL + SkySQL HA tests to suite Add test against 10.6 build update maxscale to recent version test maxscale with SSL use same travis test configuration than JDBC Windows is now testing on travis
1 parent be0b657 commit 7e44cb3

36 files changed

+329
-1297
lines changed

.travis.yml

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,56 @@
1-
#dist: trusty
2-
sudo: false
1+
os: linux
32
language: java
43
services: docker
4+
jdk: openjdk11
55
addons:
66
hosts:
77
- mariadb.example.com
8-
jdk: openjdk11
98

109
before_install:
11-
- chmod +x .travis/script.sh .travis/build/build.sh .travis/gen-ssl.sh .travis/build/docker-entrypoint.sh .travis/sql/*
12-
- chmod 777 .travis/build/
13-
- echo "MAVEN_OPTS='-Xmx384m'" > ~/.mavenrc
10+
- git clone https://github.com/mariadb-corporation/connector-test-machine.git
1411

1512
install:
16-
- mkdir tmp
17-
- .travis/gen-ssl.sh mariadb.example.com tmp
18-
- export PROJ_PATH=`pwd`
19-
- export SSLCERT=$PROJ_PATH/tmp
20-
- export TEST_SERVER_SSL_CERT=$SSLCERT/server.crt
21-
- export TEST_CLIENT_SSL_CERT=$SSLCERT/client.crt
22-
- export TEST_CLIENT_KEY=$SSLCERT/client.key
13+
- |-
14+
case $TRAVIS_OS_NAME in
15+
windows)
16+
choco install openjdk11 maven
17+
export PATH=$(cmd.exe //c "refreshenv > nul & C:\Progra~1\Git\bin\bash -c 'echo \$PATH' ")
18+
connector-test-machine/launch.bat -t "$srv" -v "$v" -d testr2
19+
;;
20+
linux)
21+
source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testr2
22+
;;
23+
esac
2324
24-
cache:
25-
directories:
26-
- $HOME/.m2
27-
28-
matrix:
25+
jobs:
26+
fast_finish: true
2927
allow_failures:
30-
- env: DB=build:10.6
31-
- env: DB=mysql:5.6
32-
- env: DB=mysql:5.7
33-
- env: DB=mysql:8.0 ADDITIONAL_CONF=--default-authentication-plugin=mysql_native_password --caching_sha2_password_private_key_path=/etc/sslcert/server.key --caching_sha2_password_public_key_path=/etc/sslcert/public.key --sha256_password_public_key_path=/etc/sslcert/public.key --sha256_password_private_key_path=/etc/sslcert/server.key
28+
- env: srv=skysql
29+
- env: srv=skysql-ha
30+
- env: srv=mariadb-es v=10.5
3431
include:
35-
- env: SKYSQL=true
36-
- env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
37-
- env: DB=mariadb:10.2
38-
- env: DB=mariadb:10.3
39-
- env: DB=mariadb:10.4
40-
- env: DB=mariadb:10.5
41-
- env: DB=mariadb:10.5 NO_BACKSLASH_ESCAPES=true
42-
- env: DB=mariadb:10.5 BENCH=1
43-
- env: DB=mariadb:10.5 MAXSCALE_VERSION=2.5.3 SSLPORT=4009 MAXSCALE_TEST_DISABLE=true
44-
- env: DB=build:10.6
45-
- env: DB=mysql:5.7
46-
- env: DB=mysql:8.0 ADDITIONAL_CONF=--default-authentication-plugin=mysql_native_password --caching_sha2_password_private_key_path=/etc/sslcert/server.key --caching_sha2_password_public_key_path=/etc/sslcert/public.key --sha256_password_public_key_path=/etc/sslcert/public.key --sha256_password_private_key_path=/etc/sslcert/server.key
32+
- env: srv=mariadb v=10.5
33+
os: windows
34+
language: shell
35+
- env: srv=mariadb v=10.2
36+
- env: srv=mariadb v=10.3
37+
- env: srv=mariadb v=10.4
38+
- env: srv=mariadb v=10.5
39+
- env: srv=mariadb v=10.5 NO_BACKSLASH_ESCAPES=true
40+
- env: srv=mariadb v=10.5 BENCH=1
41+
- env: srv=maxscale
42+
- env: srv=skysql
43+
- env: srv=skysql-ha
44+
- env: srv=build v=10.6
45+
- env: srv=mysql v=5.7
46+
- env: srv=mysql v=8.0
4747

4848
script:
49-
- if [[ "$DB" == build* ]] ; then .travis/build/build.sh; fi
50-
- if [[ "$DB" == build* ]] ; then docker build -t build:10.6 --label build .travis/build/; fi
51-
- .travis/script.sh
49+
- mvn clean -Dmaven.test.skip > /dev/null
50+
- if [ -n "$BENCH" ] ; then mvn package -P bench -Dmaven.test.skip; fi
51+
- if [ -n "$BENCH" ] ; then java -Duser.country=US -Duser.language=en -DTEST_PORT=$TEST_DB_PORT -DTEST_HOST=$TEST_DB_HOST -DTEST_USERNAME=$TEST_DB_USER -DTEST_PASSWORD=$TEST_DB_PASSWORD -jar target/benchmarks.jar; fi
52+
- if [ -z "$BENCH" ] ; then MAVEN_SKIP_RC=true MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512m" mvn test -DjobId=${TRAVIS_JOB_ID}; fi
53+
5254

5355
after_success:
5456
- bash <(curl -s https://codecov.io/bash)

.travis/build/Dockerfile

Lines changed: 0 additions & 104 deletions
This file was deleted.

.travis/build/build.sh

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)