Commit dda61ade authored by Otto Kekäläinen's avatar Otto Kekäläinen

Travis-CI: Slim down number of parallel jobs to speed up total run time

Number of jobs dropped from 23 -> 17 and build time from 8-10 hours to
3-4 hours.

Drop GCC 6 and Clang 6 from build dependencies and version 6 is dropped
from the jobs matrix.

Also ignore arm64 and ppc64le on Bionic builds since they sporadically
fail.
parent 33ffcecc
...@@ -22,7 +22,6 @@ addons: ...@@ -22,7 +22,6 @@ addons:
sources: &add-sources sources: &add-sources
- ubuntu-toolchain-r-test # Includes e.g. gcc4-9 for xenial, gcc9 for bionic - ubuntu-toolchain-r-test # Includes e.g. gcc4-9 for xenial, gcc9 for bionic
# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+packages?field.name_filter=&field.status_filter=published&field.series_filter=xenial # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+packages?field.name_filter=&field.status_filter=published&field.series_filter=xenial
- llvm-toolchain-xenial-6.0
- llvm-toolchain-xenial-7 # NOTE: This repo has no clang-7 for s390x - llvm-toolchain-xenial-7 # NOTE: This repo has no clang-7 for s390x
- sourceline: 'ppa:maria-captains/travis-ci-helper-repo' - sourceline: 'ppa:maria-captains/travis-ci-helper-repo'
# https://launchpad.net/~maria-captains/+archive/ubuntu/travis-ci-helper-repo/+packages # https://launchpad.net/~maria-captains/+archive/ubuntu/travis-ci-helper-repo/+packages
...@@ -30,14 +29,12 @@ addons: ...@@ -30,14 +29,12 @@ addons:
# make sure these include all compilers and all build dependencies (see list above) # make sure these include all compilers and all build dependencies (see list above)
- bison - bison
- chrpath - chrpath
- clang-6.0 # xenial, bionic
- clang-7 # bionic-updates, llvm-toolchain-xenial-6.0 (amd64 only, not s390x) - clang-7 # bionic-updates, llvm-toolchain-xenial-6.0 (amd64 only, not s390x)
- clang-8 # xenial, bionic - clang-8 # xenial, bionic
- cmake - cmake
- cracklib-runtime - cracklib-runtime
- galera-4 - galera-4
- g++-5 # xenial, bionic, ubuntu-toolchain-r/test (xenial) - g++-5 # xenial, bionic, ubuntu-toolchain-r/test (xenial)
- g++-6 # bionic, ubuntu-toolchain-r/test (xenial)
- g++-7 # bionic, ubuntu-toolchain-r/test (xenial) - g++-7 # bionic, ubuntu-toolchain-r/test (xenial)
- g++-8 # bionic, ubuntu-toolchain-r/test (xenial) - g++-8 # bionic, ubuntu-toolchain-r/test (xenial)
- g++-9 # ubuntu-toolchain-r/test (xenial and bionic) - g++-9 # ubuntu-toolchain-r/test (xenial and bionic)
...@@ -110,10 +107,8 @@ compiler: ...@@ -110,10 +107,8 @@ compiler:
- gcc - gcc
- clang - clang
env: env:
- CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
- CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb,versioning,rpl
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
- CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main - CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
...@@ -165,29 +160,19 @@ jobs: ...@@ -165,29 +160,19 @@ jobs:
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb,versioning,rpl
- os: linux
arch: s390x
dist: bionic
compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
# Some chosen ones with s390x and clang # Some chosen ones with s390x and clang
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: clang compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
- os: linux
arch: s390x
dist: bionic
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: clang compiler: clang
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
# Extra tests to ensure builds on IBM Power and ARM 64 work # Extra tests to ensure IBM Power and ARM 64 work
- os: linux - os: linux
dist: bionic dist: bionic
arch: ppc64le arch: ppc64le
...@@ -200,11 +185,14 @@ jobs: ...@@ -200,11 +185,14 @@ jobs:
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
allow_failures: allow_failures:
# Permanently fails on main.thread_pool_info test # Permanently fails on main.thread_pool_info test (MDEV-20372)
- os: linux - os: linux
arch: amd64 arch: amd64
compiler: clang compiler: clang
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
# Sporadically fails on main.thread_pool_info test (MDEV-20372)
- arch: ppc64le
- arch: arm64
# Until OSX becomes a bit more stable # Until OSX becomes a bit more stable
- os: osx - os: osx
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment