Skip to content

Commit 43294f1

Browse files
authored
MAGETWO-82300: Travis CI functional tests maintenance for 2.2-develop #11555
2 parents f1e6d1c + e1e2733 commit 43294f1

File tree

5 files changed

+30
-140
lines changed

5 files changed

+30
-140
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ env:
2929
- TEST_SUITE=integration INTEGRATION_INDEX=1
3030
- TEST_SUITE=integration INTEGRATION_INDEX=2
3131
- TEST_SUITE=integration INTEGRATION_INDEX=3
32-
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
33-
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
32+
- TEST_SUITE=functional
3433
matrix:
3534
exclude:
3635
- php: 7.0
@@ -40,9 +39,7 @@ matrix:
4039
- php: 7.0
4140
env: TEST_SUITE=js GRUNT_COMMAND=static
4241
- php: 7.0
43-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
44-
- php: 7.0
45-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
42+
env: TEST_SUITE=functional
4643
cache:
4744
apt: true
4845
directories:
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
10+
<rule scope="testcase">
11+
<allow>
12+
<tag group="test_type" value="acceptance_test" />
13+
</allow>
14+
<deny>
15+
<tag group="stable" value="no" />
16+
</deny>
17+
</rule>
18+
<rule scope="variation">
19+
<allow>
20+
<tag group="test_type" value="acceptance_test" />
21+
<tag group="severity" value="S0, S1" />
22+
</allow>
23+
<deny>
24+
<tag group="stable" value="no" />
25+
</deny>
26+
</rule>
27+
</config>

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml

Lines changed: 0 additions & 67 deletions
This file was deleted.

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml

Lines changed: 0 additions & 67 deletions
This file was deleted.

dev/travis/before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ case $TEST_SUITE in
126126

127127
cp ./phpunit.xml.dist ./phpunit.xml
128128
sed -e "s?127.0.0.1?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
129-
sed -e "s?basic?travis_acceptance_${ACCEPTANCE_INDEX}?g" --in-place ./phpunit.xml
129+
sed -e "s?basic?travis_acceptance?g" --in-place ./phpunit.xml
130130
cp ./.htaccess.sample ./.htaccess
131131
cd ./utils
132132
php -f mtf troubleshooting:check-all

0 commit comments

Comments
 (0)