From 713eae2a3cfdc03f22f7fe506dacfc0d61226481 Mon Sep 17 00:00:00 2001 From: Andrii Lugovyi Date: Tue, 28 Feb 2017 13:17:56 +0200 Subject: [PATCH] MAGETWO-65240: fix red build on travis for 2.0-dev branch --- .travis.yml | 19 ++++++++++--------- .../etc/install-config-mysql.travis.php.dist | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 206839fa3705d..fe18c368d4770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 diff --git a/dev/tests/integration/etc/install-config-mysql.travis.php.dist b/dev/tests/integration/etc/install-config-mysql.travis.php.dist index 39aac918ded73..48d33782df559 100644 --- a/dev/tests/integration/etc/install-config-mysql.travis.php.dist +++ b/dev/tests/integration/etc/install-config-mysql.travis.php.dist @@ -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_',