Skip to content

Commit

Permalink
Merge pull request #892 from magento-east/MAGETWO-65240
Browse files Browse the repository at this point in the history
[EAST] Fix red build on travis for 2.0-dev branch
  • Loading branch information
Volodymyr Klymenko authored Mar 6, 2017
2 parents 73f4e13 + 713eae2 commit 145eca3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
19 changes: 10 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
sudo: required
dist: trusty
addons:
apt:
packages:
- mysql-server-5.6
- mysql-client-core-5.6
- mysql-client-5.6
- postfix
language: php
php:
- 5.5
Expand Down Expand Up @@ -49,15 +58,7 @@ before_script:
# Install MySQL 5.6, create DB for integration tests
- >
sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
sudo apt-get autoremove;
sudo apt-get autoclean;
echo 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-apt-config' | sudo tee /etc/apt/sources.list.d/mysql.list;
echo 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6' | sudo tee /etc/apt/sources.list.d/mysql.list;
curl -s http://ronaldbradford.com/mysql/mysql.gpg | sudo apt-key add -;
sudo apt-get update;
sudo apt-get install -y mysql-server;
mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
mysql -u root -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
fi"
# Change memory_limit for travis
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

return [
'db-host' => '127.0.0.1',
'db-user' => 'travis',
'db-user' => 'root',
'db-password' => '',
'db-name' => 'magento_integration_tests',
'db-prefix' => 'trv_',
Expand Down

0 comments on commit 145eca3

Please sign in to comment.