Skip to content

Commit 145eca3

Browse files
author
Volodymyr Klymenko
authored
Merge pull request #892 from magento-east/MAGETWO-65240
[EAST] Fix red build on travis for 2.0-dev branch
2 parents 73f4e13 + 713eae2 commit 145eca3

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
sudo: required
2+
dist: trusty
3+
addons:
4+
apt:
5+
packages:
6+
- mysql-server-5.6
7+
- mysql-client-core-5.6
8+
- mysql-client-5.6
9+
- postfix
110
language: php
211
php:
312
- 5.5
@@ -49,15 +58,7 @@ before_script:
4958
# Install MySQL 5.6, create DB for integration tests
5059
- >
5160
sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
52-
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;
53-
sudo apt-get autoremove;
54-
sudo apt-get autoclean;
55-
echo 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-apt-config' | sudo tee /etc/apt/sources.list.d/mysql.list;
56-
echo 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6' | sudo tee /etc/apt/sources.list.d/mysql.list;
57-
curl -s http://ronaldbradford.com/mysql/mysql.gpg | sudo apt-key add -;
58-
sudo apt-get update;
59-
sudo apt-get install -y mysql-server;
60-
mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
61+
mysql -u root -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
6162
mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
6263
fi"
6364
# Change memory_limit for travis

dev/tests/integration/etc/install-config-mysql.travis.php.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
return [
88
'db-host' => '127.0.0.1',
9-
'db-user' => 'travis',
9+
'db-user' => 'root',
1010
'db-password' => '',
1111
'db-name' => 'magento_integration_tests',
1212
'db-prefix' => 'trv_',

0 commit comments

Comments
 (0)