From a22f0314308c1b44fe0b5431f31fbd2f32398ae0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 4 Oct 2016 16:52:00 +0300 Subject: Remove useless parts from .gitlab-ci.yml --- .gitlab-ci.yml | 654 ++++++++--------------------------------------------- tools/ci/travis.sh | 1 + 2 files changed, 98 insertions(+), 557 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad4a20bf8..dcf5a4471 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: - secondary - platforms - clients - - extras +# - extras variables: &base_vars # Configure mysql service (https://hub.docker.com/_/mysql/) @@ -12,7 +12,7 @@ variables: &base_vars MYSQL_PASSWORD: 'ragnarok' MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' GIT_DEPTH: '3' - DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python + DEBIAN_COMMON_PACKAGES: make autoconf zlib1g-dev libpcre3-dev git python .prerequisites: &prerequisites before_script: @@ -20,8 +20,10 @@ variables: &base_vars - uname -a - ./tools/ci/retry.sh apt-get update - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true +# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh getplugins || true + services: + - mysql:latest .branch_exceptions: &branch_exceptions only: @@ -32,21 +34,6 @@ variables: &base_vars # Compilers -pre_re:clang-3.9: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - re:clang-3.9: <<: *branch_exceptions <<: *prerequisites @@ -60,7 +47,7 @@ re:clang-3.9: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:clang-3.9: <<: *branch_exceptions @@ -75,22 +62,7 @@ zero-2018:clang-3.9: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-4.0: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:clang-4.0: <<: *branch_exceptions @@ -105,7 +77,7 @@ re:clang-4.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:clang-4.0: <<: *branch_exceptions @@ -120,30 +92,7 @@ zero-2018:clang-4.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-5.0: - <<: *branch_exceptions - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list - - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:clang-5.0: <<: *branch_exceptions @@ -154,8 +103,8 @@ re:clang-5.0: - ./tools/ci/retry.sh apt-get update - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true +# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh getplugins || true stage: secondary image: debian:stretch services: @@ -166,7 +115,7 @@ re:clang-5.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:clang-5.0: <<: *branch_exceptions @@ -177,8 +126,8 @@ zero-2018:clang-5.0: - ./tools/ci/retry.sh apt-get update - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true +# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh getplugins || true stage: clients image: debian:stretch services: @@ -189,22 +138,7 @@ zero-2018:clang-5.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-6.0: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:unstable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-6.0 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:clang-6.0: <<: *branch_exceptions @@ -219,7 +153,7 @@ re:clang-6.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:clang-6.0: <<: *branch_exceptions @@ -234,22 +168,7 @@ zero-2018:clang-6.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-7: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:unstable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-7 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:clang-7: <<: *branch_exceptions @@ -264,7 +183,7 @@ re:clang-7: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:clang-7: <<: *branch_exceptions @@ -279,22 +198,7 @@ zero-2018:clang-7: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-4.6: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:wheezy - services: - - mysql:5.5 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-4.6: <<: *branch_exceptions @@ -309,7 +213,7 @@ re:gcc-4.6: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-4.6: <<: *branch_exceptions @@ -324,22 +228,7 @@ zero-2018:gcc-4.6: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-4.7: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:wheezy - services: - - mysql:5.5 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-4.7: <<: *branch_exceptions @@ -354,7 +243,7 @@ re:gcc-4.7: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-4.7: <<: *branch_exceptions @@ -369,7 +258,7 @@ zero-2018:gcc-4.7: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST pre_re:gcc-4.8: <<: *branch_exceptions @@ -384,7 +273,7 @@ pre_re:gcc-4.8: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-4.8: <<: *branch_exceptions @@ -399,7 +288,7 @@ re:gcc-4.8: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-4.8: <<: *branch_exceptions @@ -414,22 +303,7 @@ zero-2018:gcc-4.8: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-4.9: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:jessie - services: - - mysql:5.5 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-4.9 mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-4.9: <<: *branch_exceptions @@ -444,7 +318,7 @@ re:gcc-4.9: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-4.9: <<: *branch_exceptions @@ -459,24 +333,9 @@ zero-2018:gcc-4.9: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-5: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:unstable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -re:gcc-5: +.re:gcc-5: <<: *branch_exceptions <<: *prerequisites stage: secondary @@ -489,9 +348,9 @@ re:gcc-5: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -zero-2018:gcc-5: +.zero-2018:gcc-5: <<: *branch_exceptions <<: *prerequisites stage: clients @@ -504,22 +363,7 @@ zero-2018:gcc-5: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-6: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-6: <<: *branch_exceptions @@ -534,7 +378,7 @@ re:gcc-6: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-6: <<: *branch_exceptions @@ -549,22 +393,7 @@ zero-2018:gcc-6: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-7: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:unstable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-7 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-7: <<: *branch_exceptions @@ -579,7 +408,7 @@ re:gcc-7: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-7 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-7: <<: *branch_exceptions @@ -594,22 +423,7 @@ zero-2018:gcc-7: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-8: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:unstable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-8: <<: *branch_exceptions @@ -624,7 +438,7 @@ re:gcc-8: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-8: <<: *branch_exceptions @@ -639,22 +453,7 @@ zero-2018:gcc-8: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-6_i386: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: i386/debian:stable - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-6_i386: <<: *branch_exceptions @@ -669,7 +468,7 @@ re:gcc-6_i386: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-6_i386: <<: *branch_exceptions @@ -684,22 +483,7 @@ zero-2018:gcc-6_i386: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-6_sanitize: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-6_sanitize: <<: *branch_exceptions @@ -714,7 +498,7 @@ re:gcc-6_sanitize: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-6_sanitize: <<: *branch_exceptions @@ -729,22 +513,7 @@ zero-2018:gcc-6_sanitize: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-6_i386_sanitize: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: i386/debian:stable - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-6_i386_sanitize: <<: *branch_exceptions @@ -759,7 +528,7 @@ re:gcc-6_i386_sanitize: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-6_i386_sanitize: <<: *branch_exceptions @@ -774,29 +543,7 @@ zero-2018:gcc-6_i386_sanitize: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-6_cov: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal CFLAGS="-coverage" LDFLAGS="-coverage" - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - - gcovr -r . --gcov-executable=gcov-6 -o gcov_pre.txt - - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_pre.html - - cat gcov_pre.txt - artifacts: - paths: - - gcov_pre.* - when: on_success +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-6_cov: <<: *branch_exceptions @@ -811,32 +558,17 @@ re:gcc-6_cov: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot CFLAGS="-coverage" LDFLAGS="-coverage" - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - - gcovr -r . --gcov-executable=gcov-6 -o gcov_re.txt - - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_re.html - - cat gcov_re.txt - artifacts: - paths: - - gcov_re.* - when: on_success +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - gcovr -r . --gcov-executable=gcov-6 -o gcov_re.txt +# - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_re.html +# - cat gcov_re.txt +# artifacts: +# paths: +# - gcov_re.* +# when: on_success # Distributions -pre_re:debian-oldstable: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:oldstable - services: - - mysql:5.5 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - re:debian-oldstable: <<: *branch_exceptions <<: *prerequisites @@ -850,22 +582,7 @@ re:debian-oldstable: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:debian-stable: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:stable - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:debian-stable: <<: *branch_exceptions @@ -880,22 +597,7 @@ re:debian-stable: SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:debian-testing: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:testing - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:debian-testing: <<: *branch_exceptions @@ -910,28 +612,6 @@ re:debian-testing: SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:centos-previous: - <<: *branch_exceptions - stage: platforms - image: centos:6 - services: - - mysql:5.5 - variables: - <<: *base_vars - SQLHOST: mysql - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - yum -y update - - yum install -y make mysql-devel pcre-devel git zlib-devel mysql centos-release-scl - - yum install -y devtoolset-6-toolchain - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - script: - - 'source /opt/rh/devtoolset-6/enable && ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal' - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:centos-previous: <<: *branch_exceptions @@ -946,33 +626,14 @@ re:centos-previous: - echo "Building $CI_BUILD_NAME" - uname -a - yum -y update - - yum install -y make mysql-devel pcre-devel git zlib-devel mysql centos-release-scl - - yum install -y devtoolset-6-toolchain - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true + - yum install -y make mysql-devel pcre-devel git zlib-devel mysql + - yum install -y centos-release-scl + - yum install -y yum install devtoolset-3-toolchain +# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh getplugins || true script: - - 'source /opt/rh/devtoolset-6/enable && ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot' - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:centos-current: - <<: *branch_exceptions - stage: platforms - image: centos:7 - services: - - mariadb:5.5 - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - yum -y update - - yum install -y gcc make mariadb-devel pcre-devel git zlib-devel mariadb - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - variables: - <<: *base_vars - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + - scl enable devtoolset-3 './tools/ci/travis.sh build CFLAGS="-Wno-cast-qual" --enable-debug --enable-Werror --enable-buildbot' +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:centos-current: <<: *branch_exceptions @@ -985,29 +646,14 @@ re:centos-current: - uname -a - yum -y update - yum install -y gcc make mariadb-devel pcre-devel git zlib-devel mariadb - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true +# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh getplugins || true variables: <<: *base_vars SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:ubuntu-xenial: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: ubuntu:16.04 - services: - - mysql:5.7 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:ubuntu-xenial: <<: *branch_exceptions @@ -1022,7 +668,7 @@ re:ubuntu-xenial: SQLHOST: mysql 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 pre_re:ubuntu-bionic: <<: *branch_exceptions @@ -1037,7 +683,7 @@ pre_re:ubuntu-bionic: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:ubuntu-bionic: <<: *branch_exceptions @@ -1052,25 +698,10 @@ re:ubuntu-bionic: SQLHOST: mysql 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 # SQL servers -pre_re:mysql-5.5: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:jessie - services: - - mysql:5.5 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.5 libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - re:mysql-5.5: <<: *branch_exceptions <<: *prerequisites @@ -1084,22 +715,7 @@ re:mysql-5.5: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:mysql-5.6: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:unstable - services: - - mysql:5.6 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mysql-5.6: <<: *branch_exceptions @@ -1114,22 +730,7 @@ re:mysql-5.6: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:mysql-5.7: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:unstable - services: - - mysql:5.7 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.7 libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mysql-5.7: <<: *branch_exceptions @@ -1144,22 +745,7 @@ re:mysql-5.7: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:mariadb-10.0: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:jessie - services: - - mariadb:10.0 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.0 libmysqlclient-dev - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mariadb-10.0: <<: *branch_exceptions @@ -1174,22 +760,7 @@ re:mariadb-10.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:mariadb-10.1: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:stable - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.1 libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mariadb-10.1: <<: *branch_exceptions @@ -1204,22 +775,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 - -pre_re:mariadb-latest: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:unstable - services: - - mariadb:latest - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mariadb-latest: <<: *branch_exceptions @@ -1234,22 +790,7 @@ re:mariadb-latest: SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:percona: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:stretch - services: - - percona:latest - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat - SQLHOST: percona - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:percona: <<: *branch_exceptions @@ -1264,29 +805,28 @@ re:percona: SQLHOST: percona 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 # Documentation -pages: - only: - - master - stage: extras - image: debian:unstable - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq gcc $DEBIAN_COMMON_PACKAGES libmysqlclient-dev doxygen graphviz - script: - - ./configure - - make docs - - mkdir public - - mv tools/doxygen/docs/html public/docs - - mv gcov_*.* public/ - - cp tools/doxygen/pages_index.html public/index.html - dependencies: - - re:gcc-6_cov - - pre_re:gcc-6_cov - artifacts: - paths: - - public +#pages: +# only: +# - master +# stage: extras +# image: debian:unstable +# before_script: +# - echo "Building $CI_BUILD_NAME" +# - uname -a +# - ./tools/ci/retry.sh apt-get update +# - ./tools/ci/retry.sh apt-get install -y -qq gcc $DEBIAN_COMMON_PACKAGES libmysqlclient-dev doxygen graphviz +# script: +# - ./configure +# - make docs +# - mkdir public +# - mv tools/doxygen/docs/html public/docs +# - mv gcov_*.* public/ +# - cp tools/doxygen/pages_index.html public/index.html +# dependencies: +# - re:gcc-6_cov +# artifacts: +# paths: +# - public diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh index fa7d5be93..2847335c1 100755 --- a/tools/ci/travis.sh +++ b/tools/ci/travis.sh @@ -144,6 +144,7 @@ case "$MODE" in ;; build) (cd tools && ./validateinterfaces.py silent) || aborterror "Interface validation error." + autoreconf ./configure $@ || (cat config.log && aborterror "Configure error, aborting build.") make -j3 || aborterror "Build failed." make plugins -j3 || aborterror "Build failed." -- cgit v1.2.3-70-g09d2