|
 |
136e2c |
From 548ae4d0fe1484749560fcfa1f1d48bf339adb66 Mon Sep 17 00:00:00 2001
|
|
|
136e2c |
From: Eric Garver <eric@garver.life>
|
|
|
136e2c |
Date: Tue, 16 Apr 2019 16:43:29 -0400
|
|
|
136e2c |
Subject: [PATCH 52/73] chore: travis: split test matrix by keywords
|
|
|
136e2c |
|
|
|
136e2c |
This will cause the tests to be split up and each VM will run for less
|
|
|
136e2c |
time. This effectively decreases the CI time by running more in
|
|
|
136e2c |
parallel.
|
|
|
136e2c |
|
|
|
136e2c |
(cherry picked from commit a833a4228fd14f78bb4320427b63ac51f84760f6)
|
|
|
136e2c |
(cherry picked from commit d357dd0fb904a1a4f31b329cb7dd1c4b41035661)
|
|
|
136e2c |
---
|
|
|
136e2c |
.travis.yml | 10 +++++++++-
|
|
|
136e2c |
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
136e2c |
|
|
|
136e2c |
diff --git a/.travis.yml b/.travis.yml
|
|
|
136e2c |
index d5743e5c4ef6..e3410857599b 100644
|
|
|
136e2c |
--- a/.travis.yml
|
|
|
136e2c |
+++ b/.travis.yml
|
|
|
136e2c |
@@ -12,6 +12,13 @@ python:
|
|
|
136e2c |
- "2.7"
|
|
|
136e2c |
- "3.4"
|
|
|
136e2c |
|
|
|
136e2c |
+# Use keywords to split the tests into smaller groups and therefore decrease
|
|
|
136e2c |
+# the time CI takes to run.
|
|
|
136e2c |
+env:
|
|
|
136e2c |
+ - TESTSUITEFLAGS="-k offline -j3"
|
|
|
136e2c |
+ - TESTSUITEFLAGS="-k nftables -j3"
|
|
|
136e2c |
+ - TESTSUITEFLAGS="-k iptables -j3"
|
|
|
136e2c |
+
|
|
|
136e2c |
# Install necessary dependencies
|
|
|
136e2c |
before_install:
|
|
|
136e2c |
- sudo apt-get update -qq
|
|
|
136e2c |
@@ -52,7 +59,8 @@ script:
|
|
|
136e2c |
# Do a parallel build to spot potential dependency problems.
|
|
|
136e2c |
# No ebtables-restore in ubuntu 14.04
|
|
|
136e2c |
- ./autogen.sh --with-ebtables-restore=/bin/false --sysconfdir=/etc && make -j32
|
|
|
136e2c |
- - sudo env PATH="$PATH" make check TESTSUITEFLAGS="-j3" ||
|
|
|
136e2c |
+ # Note: TESTSUITEFLAGS implicit from env above
|
|
|
136e2c |
+ - sudo env PATH="$PATH" make check ||
|
|
|
136e2c |
sudo env PATH="$PATH" make check TESTSUITEFLAGS="--recheck --errexit -v -d"
|
|
|
136e2c |
|
|
|
136e2c |
# uncomment to add IRC notifications
|
|
|
136e2c |
--
|
|
|
136e2c |
2.20.1
|
|
|
136e2c |
|