Skip to content

Commit

Permalink
Merge pull request #120 from CartoDB/debug-travis
Browse files Browse the repository at this point in the history
Start MySQL before updating it
  • Loading branch information
jgoizueta authored Feb 17, 2020
2 parents 56de118 + 44b530f commit 49cbb5b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ addons:
sources:
- sourceline: 'ppa:cartodb/odbc'
packages:
- mysql-server-core-5.7
- mysql-client-5.7
- mysql-server-5.7
- unixodbc-dev
- odbcinst # ODBC core
- odbc-postgresql # PgSQL ODBC
Expand All @@ -48,8 +45,10 @@ before_install:
- sudo bash $TRAVIS_BUILD_DIR/test/scripts/ci/install_postgres.sh
# Install Hive (sudos in script as needed)
- bash $TRAVIS_BUILD_DIR/test/scripts/ci/install_hive.sh
# Starting up MySQL
# Start & Update MySQL (update using apt addon will fail if mysql not started)
- sudo systemctl enable mysql
- sudo service mysql start
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install mysql-server-core-5.7 mysql-client-5.7 mysql-server-5.7
# ODBC installation ini file
- sudo cp $TRAVIS_BUILD_DIR/test/scripts/ci/odbcinst.ini /etc

Expand Down
1 change: 1 addition & 0 deletions test/fixtures/load_all_fixtures.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ load_postgres_fixtures()
load_mysql_fixtures()
{
load_config "mysql.config"
sudo mysql -u root -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$password';"
echo "create database if not exists fdw_tests" | mysql -u $user
mysql -u $user -D $dbname < "$BASEDIR/mysql_fixtures.sql"
}
Expand Down

0 comments on commit 49cbb5b

Please sign in to comment.