From 220b112dbdd337afbb6da357aa982640887deaef Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@magento.com>
Date: Mon, 21 Dec 2015 14:33:58 -0600
Subject: [PATCH] MAGETWO-47171: Fix broken travis build
- fixing travis build to use trusty
---
.travis.yml | 13 +++++++------
.../etc/install-config-mysql.travis.php.dist | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a99b22b1ebd..e078e89011d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+sudo: required
+dist: trusty
+
language: php
php:
- 5.5
@@ -44,12 +47,10 @@ 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;
- sudo apt-add-repository ppa:ondrej/mysql-5.6 -y;
- sudo apt-get update;
- sudo apt-get install mysql-server-5.6 mysql-client-5.6;
+ sudo apt-get remove -y -qq --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
+ sudo apt-get -y -qq autoremove;
+ sudo apt-get -y -qq autoclean;
+ sudo apt-get install -y -qq mysql-server-5.6 mysql-client-5.6;
mysql -uroot -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"
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 1359c82a334..22004fc345e 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_',
--
GitLab