Skip to content
This repository was archived by the owner on May 14, 2020. It is now read-only.

Commit 4f24989

Browse files
fgschfzipi
authored andcommitted
Move integration tests to their own job (#1608)
Also cleanup branches' list.
1 parent a45ae41 commit 4f24989

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ jobs:
1414
- env: CONFIG=3.0-nginx LOGDIR=/var/log/nginx
1515
fast_finish: true
1616
include:
17+
- install:
18+
- pip install -r util/integration/requirements.txt
19+
before_script:
20+
- git clone https://github.com/CRS-support/secrules_parsing
21+
- pip install -r secrules_parsing/requirements.txt
22+
- python secrules_parsing/secrules_parser.py -c -f rules/*.conf
23+
script:
24+
- py.test -vs util/integration/format_tests.py
1725
- &test-common
1826
env: CONFIG=2.9-apache LOGDIR=/var/log/apache2
1927
before_install:
@@ -40,14 +48,8 @@ jobs:
4048
exit 1
4149
fi
4250
install:
43-
- pip install -r util/integration/requirements.txt
4451
- pip install -r util/regression-tests/requirements.txt
45-
before_script:
46-
- git clone https://github.com/CRS-support/secrules_parsing
47-
- pip install -r secrules_parsing/requirements.txt
48-
- python secrules_parsing/secrules_parser.py -c -f rules/*.conf
4952
script:
50-
- py.test -vs util/integration/format_tests.py
5153
- |
5254
py.test -vs util/regression-tests/CRS_Tests.py \
5355
--config=$CONFIG --ruledir_recurse=util/regression-tests/tests
@@ -60,8 +62,6 @@ jobs:
6062
# safelist
6163
branches:
6264
only:
63-
- v3.0/dev
64-
- v3.0/master
6565
- v3.1/dev
6666
- v3.2/dev
6767
- v3.3/dev

0 commit comments

Comments
 (0)