Skip to content

Commit fcb9a5f

Browse files
lawrinnlawrinn
committed
Updated travis and appveyor configs - server versions, build scripts
Added(restored?) SkySQL testing config. Fixed one test for the case of iodbc - it seemingly doesn't think, that SQLExecute or SQLExecDirect may return SQL_SUCCESS_WITH_INFO, and returns SQL_SUCCESS instead.
1 parent e1e19cf commit fcb9a5f

File tree

8 files changed

+469
-215
lines changed

8 files changed

+469
-215
lines changed

‎.travis.yml‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,8 @@ services: docker
44
addons:
55
hosts:
66
- mariadb.example.com
7-
# homebrew:
8-
# packages:
9-
# - openssl
10-
# - libiodbc
11-
# - mariadb
127

138
before_install:
14-
#- chmod +x .travis/script.sh
15-
#- chmod +x .travis/osx.sh
16-
#- chmod +x .travis/gen-ssl.sh
17-
#- chmod +x .travis/build/build.sh
18-
#- chmod +x .travis/build/docker-entrypoint.sh
199
- chmod 777 .travis/build/
2010
- export PROJ_PATH=`pwd`
2111
- export ENTRYPOINT=$PROJ_PATH/.travis/sql
@@ -26,7 +16,7 @@ before_install:
2616
matrix:
2717
allow_failures:
2818
- os: linux
29-
env: DB=mariadb:10.2 PACKET=8M MAXSCALE_VERSION=2.1.8
19+
env: DB=mariadb:10.5 PACKET=8M MAXSCALE_VERSION=2.5.3
3020
- os: linux
3121
env: DB=build
3222
- os: linux
@@ -39,11 +29,11 @@ matrix:
3929
env: DB=mariadb:10.5
4030
- os: linux
4131
env: DB=mariadb:10.1
32+
- env: SKYSQL=true
33+
- env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
4234
include:
4335
- os: linux
44-
env: DB=build
45-
- os: linux
46-
env: DB=mariadb:10.1
36+
env: DB=build:10.6
4737
- os: linux
4838
env: DB=mariadb:10.2
4939
- os: linux
@@ -56,18 +46,20 @@ matrix:
5646
- os: linux
5747
compiler: clang
5848
env: DB=mariadb:10.5
49+
- env: SKYSQL=true
50+
- env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
5951
- os: osx
6052
compiler: gcc
6153
env: DB=mariadb:10.5
6254
addons:
63-
mariadb: '10.5'
55+
mariadb: '10.4'
6456
before_script:
6557
- brew update
6658
- brew install openssl
6759
- brew install libiodbc
6860
- brew install mariadb
6961
- os: linux
70-
env: DB=mariadb:10.2 PACKET=8M MAXSCALE_VERSION=2.1.8
62+
env: DB=mariadb:10.5 PACKET=8M MAXSCALE_VERSION=2.5.3
7163
- os: linux
7264
env: DB=mysql:5.5
7365
- os: linux
@@ -76,7 +68,7 @@ matrix:
7668
env: DB=mysql:5.7
7769

7870
script:
79-
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DB" = "build" ] ; then .travis/build/build.sh; fi
80-
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DB" = "build" ] ; then docker build -t build:latest --label build .travis/build/; fi
71+
- if [[ "$DB" == build* ]] ; then .travis/build/build.sh; fi
72+
- if [[ "$DB" == build* ]] ; then docker build -t build:10.6 --label build .travis/build/; fi
8173
- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then .travis/script.sh; fi
8274
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then .travis/osx.sh; fi

‎.travis/build/Dockerfile‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# vim:set ft=dockerfile:
2-
FROM ubuntu:bionic
2+
FROM ubuntu:xenial
33

44
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
55
RUN groupadd -r mysql && useradd -r -g mysql mysql
@@ -57,18 +57,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
5757
&& rm -rf /var/lib/apt/lists/*
5858

5959
RUN { \
60-
echo "mariadb-server-10.5" mysql-server/root_password password 'unused'; \
61-
echo "mariadb-server-10.5" mysql-server/root_password_again password 'unused'; \
60+
echo "mariadb-server-10.6" mysql-server/root_password password 'unused'; \
61+
echo "mariadb-server-10.6" mysql-server/root_password_again password 'unused'; \
6262
} | debconf-set-selections
6363

6464
RUN apt-get update -y
6565
RUN apt-get install -y software-properties-common wget
66-
RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
67-
RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net F1656F24C74CD1D8
68-
RUN echo 'deb http://yum.mariadb.org/galera/repo/deb bionic main' > /etc/apt/sources.list.d/galera-test-repo.list
69-
RUN apt-get update -y
66+
#RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
67+
#RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net F1656F24C74CD1D8
68+
#RUN echo 'deb http://yum.mariadb.org/galera/repo/deb xenial main' > /etc/apt/sources.list.d/galera-test-repo.list
69+
#RUN apt-get update -y
70+
71+
RUN apt-get install -y curl libdbi-perl rsync socat libnuma1 libaio1 zlib1g-dev libreadline5 libjemalloc1 libsnappy1v5 libcrack2
7072

71-
RUN apt-get install -y curl libdbi-perl rsync socat galera3 libnuma1 libaio1 zlib1g-dev libreadline5 libjemalloc1 libsnappy1v5 libcrack2
73+
#RUN apt-get install -y galera3
7274

7375
COPY *.deb /root/
7476
RUN chmod 777 /root/*
@@ -77,16 +79,17 @@ RUN dpkg --install /root/mysql-common*
7779
RUN dpkg --install /root/mariadb-common*
7880
RUN dpkg -R --unpack /root/
7981
RUN apt-get install -f -y
80-
82+
RUN ls -lrt /etc/mysql
83+
RUN ls -lrt /etc/mysql/mariadb.conf.d
8184
RUN rm -rf /var/lib/apt/lists/* \
82-
&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/conf.d/* \
85+
&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/mariadb.conf.d/*.cnf \
8386
&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
8487
&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
8588
&& chmod 777 /var/run/mysqld \
8689
&& find /etc/mysql/ -name '*.cnf' -print0 \
8790
| xargs -0 grep -lZE '^(bind-address|log)' \
8891
| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/' \
89-
&& echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/conf.d/docker.cnf
92+
&& echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/mariadb.conf.d/docker.cnf
9093

9194
VOLUME /var/lib/mysql
9295

‎.travis/build/build.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ echo "**************************************************************************
44
echo "* searching for last complete build"
55
echo "**************************************************************************"
66

7-
wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.5/
7+
wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.6/
88
grep -o ">build-[0-9]*" index.html | grep -o "[0-9]*" | tac | while read -r line ; do
99

10-
curl -s --head http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
10+
curl -s --head http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
1111
if [ $? = "0" ]; then
1212
echo "**************************************************************************"
1313
echo "* Processing $line"
1414
echo "**************************************************************************"
15-
wget -q -o /dev/null -O $line.html http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/
15+
wget -q -o /dev/null -O $line.html http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/debs/binary/
1616
grep -o ">[^\"]*\.deb" $line.html | grep -o "[^>]*\.deb" | while read -r file ; do
1717
if [[ "$file" =~ ^mariadb-plugin.* ]] ;
1818
then
1919
echo "skipped file: $file"
2020
else
21-
echo "download file: $file"
22-
wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/$file
21+
echo "download file: http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/debs/binary/$file"
22+
wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/debs/binary/$file
2323
fi
2424
done
2525

0 commit comments

Comments
 (0)