From 22f17a188752499b053d8c2d9becd7f00aba327a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 14 Jul 2020 10:29:56 +0300
Subject: [PATCH] Travis CI improvements (#37840)

---
 .travis.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df82895284e..fca06468ddd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 dist: bionic
 addons:
   apt:
@@ -14,7 +13,17 @@ addons:
     sources:
       - sourceline: ppa:savoury1/ffmpeg4
 
-matrix:
+python:
+  - "3.7.1"
+  - "3.8"
+
+env:
+  - TOX_ARGS="-- --test-group-count 4 --test-group 1"
+  - TOX_ARGS="-- --test-group-count 4 --test-group 2"
+  - TOX_ARGS="-- --test-group-count 4 --test-group 3"
+  - TOX_ARGS="-- --test-group-count 4 --test-group 4"
+
+jobs:
   fast_finish: true
   include:
     - python: "3.7.1"
@@ -23,13 +32,11 @@ matrix:
       env: TOXENV=pylint PYLINT_ARGS=--jobs=0 TRAVIS_WAIT=30
     - python: "3.7.1"
       env: TOXENV=typing
-    - python: "3.7.1"
-      env: TOXENV=py37
 
 cache:
   pip: true
   directories:
     - $HOME/.cache/pre-commit
-install: pip install -U tox
+install: pip install -U tox tox-travis
 language: python
-script: ${TRAVIS_WAIT:+travis_wait $TRAVIS_WAIT} tox --develop
+script: ${TRAVIS_WAIT:+travis_wait $TRAVIS_WAIT} tox --develop ${TOX_ARGS-}