diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-22 06:39:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-22 06:39:27 +0000 |
| commit | ef99aff4c3de2143d10b904538dd4618b68944ef (patch) | |
| tree | 62cca87d7f32358f71ffdb3a928a022a07188399 | |
| parent | d91a83aef772c436ebc30ff898dc11c65fe9d13b (diff) | |
| parent | 2855d34f023b5c0957175a167fde0919b1350f3d (diff) | |
| download | turbo-hipster-ef99aff4c3de2143d10b904538dd4618b68944ef.tar.gz | |
Merge "Allow databases to be preloaded"
| -rwxr-xr-x | turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh b/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh index 62d9e53..bf27da0 100755 --- a/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh +++ b/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh @@ -244,11 +244,13 @@ which mkvirtualenv set +x # Restore database to known good state -echo "Restoring test database $DB_NAME" +echo "Loading test database $DB_NAME" set -x -mysql -u $DB_USER --password=$DB_PASS -e "drop database $DB_NAME" -mysql -u $DB_USER --password=$DB_PASS -e "create database $DB_NAME" -mysql -u $DB_USER --password=$DB_PASS $DB_NAME < $DATASET_SEED_SQL +if ! mysql -u $DB_USER --password=$DB_PASS -e 'use $DB_NAME' +then + mysql -u $DB_USER --password=$DB_PASS -e "create database $DB_NAME" + mysql -u $DB_USER --password=$DB_PASS $DB_NAME < $DATASET_SEED_SQL +fi set +x echo "Build test environment" |