Skip to content

Commit 255a1e3

Browse files
bsideuprnorth
authored andcommitted
Speed up Travis (#386)
* remove custom Docker installation (with the latest Travis release they have Docker 2017.03-ce) * merge alpine + shade tests (-1 allocated node. Travis limits it to 5) * remove "sudo" from deploy's stage (boot time dropped from 20-50s to 1-6s, see https://docs.travis-ci.com/user/ci-environment/ )
1 parent 2ac72e0 commit 255a1e3

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

.travis.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ cache:
2323

2424
install:
2525
- echo "MAVEN_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1'" > ~/.mavenrc
26-
- sudo apt-get update -qq
27-
- sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew install docker-ce
28-
- docker info
29-
# Update env vars required by testcontainers
30-
- export DOCKER_HOST=tcp://127.0.0.1:2375
31-
- export DOCKER_TLS_VERIFY=0
32-
- env
3326
- ./mvnw -T4 -DskipTests=true -Dmaven.javadoc.skip=true install
3427

3528
jobs:
@@ -44,9 +37,10 @@ jobs:
4437
- env: [ NAME=modules ]
4538
script: ./mvnw -pl !core,!modules/selenium test
4639

47-
# Run Docker-in-Docker tests inside Alpine
48-
- env: [ NAME=docker-in-alpine-docker ]
49-
script: |
40+
# Run Docker-in-Docker tests inside Alpine and shading tests
41+
- env: [ NAME="docker-in-alpine-docker&shade" ]
42+
script:
43+
- |
5044
DOCKER_HOST=unix:///var/run/docker.sock DOCKER_TLS_VERIFY= docker run -t --rm \
5145
-v "$HOME/.m2":/root/.m2/ \
5246
-v /var/run/docker.sock:/var/run/docker.sock \
@@ -55,10 +49,11 @@ jobs:
5549
openjdk:8-jdk-alpine \
5650
./mvnw -pl core test -Dtest=*GenericContainerRuleTest
5751
58-
- env: [ NAME=shade ]
59-
script: ./mvnw test -f shade-test/pom.xml
52+
- ./mvnw test -f shade-test/pom.xml
6053

6154
- stage: deploy
55+
sudo: false
56+
services: []
6257
install: skip
6358
script: skip
6459
deploy:

0 commit comments

Comments
 (0)