From 5a316acea8cc0aff833d17a3910725ffc05bae9b Mon Sep 17 00:00:00 2001 From: jak1 Date: Sun, 19 Sep 2021 21:46:06 +0200 Subject: disabled '...travis.sh test' changed mysql5.7 to mysql8.0 (gitlab timeout bug) --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 765f4f681..0e2ca0f1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -585,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 @@ -628,7 +628,7 @@ re:mariadb-10.1: SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mariadb-10.3: <<: *branch_exceptions -- cgit v1.2.3-70-g09d2