Skip to content

Travis CI functional tests maintenance for 2.2-develop #11555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2017
Merged

Travis CI functional tests maintenance for 2.2-develop #11555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ env:
- TEST_SUITE=integration INTEGRATION_INDEX=1
- TEST_SUITE=integration INTEGRATION_INDEX=2
- TEST_SUITE=integration INTEGRATION_INDEX=3
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
- TEST_SUITE=functional
matrix:
exclude:
- php: 7.0
Expand All @@ -40,9 +39,7 @@ matrix:
- php: 7.0
env: TEST_SUITE=js GRUNT_COMMAND=static
- php: 7.0
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
- php: 7.0
env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
env: TEST_SUITE=functional
cache:
apt: true
directories:
Expand Down
27 changes: 27 additions & 0 deletions dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testcase">
<allow>
<tag group="test_type" value="acceptance_test" />
</allow>
<deny>
<tag group="stable" value="no" />
</deny>
</rule>
<rule scope="variation">
<allow>
<tag group="test_type" value="acceptance_test" />
<tag group="severity" value="S0, S1" />
</allow>
<deny>
<tag group="stable" value="no" />
</deny>
</rule>
</config>
67 changes: 0 additions & 67 deletions ...tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions ...tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dev/travis/before_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ case $TEST_SUITE in

cp ./phpunit.xml.dist ./phpunit.xml
sed -e "s?127.0.0.1?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
sed -e "s?basic?travis_acceptance_${ACCEPTANCE_INDEX}?g" --in-place ./phpunit.xml
sed -e "s?basic?travis_acceptance?g" --in-place ./phpunit.xml
cp ./.htaccess.sample ./.htaccess
cd ./utils
php -f mtf troubleshooting:check-all
Expand Down