From e751f975b3d5247f4cb1effe11c235a84a27c6ea Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 1 Dec 2015 19:43:54 +0100 Subject: [PATCH] Improved creation of config/database.yml --- .gitlab-ci.yml | 29 +---------------------------- script/build/test_db_config.sh | 34 +++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68a0a8a8d..608fc039d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ before_script: - bundle install + - script/build/test_db_config.sh stages: - pre @@ -26,7 +27,6 @@ job_unit: - zammad script: - export RAILS_ENV=test - - script/build/test_db_config.sh test ci_zammad_unit - rake db:drop; - rake db:create - rake db:migrate @@ -40,7 +40,6 @@ job_integration_email_helper: - zammad script: - export RAILS_ENV=test - - script/build/test_db_config.sh test ci_zammad_email_helper - rake db:drop; - rake db:create - rake db:migrate @@ -52,7 +51,6 @@ job_integration_geo_ip: - zammad script: - export RAILS_ENV=test - - script/build/test_db_config.sh test ci_zammad_geo_ip - rake db:drop; - rake db:create - rake db:migrate @@ -64,7 +62,6 @@ job_integration_geo_location: - zammad script: - export RAILS_ENV=test - - script/build/test_db_config.sh test ci_zammad_geo_location - rake db:drop; - rake db:create - rake db:migrate @@ -76,7 +73,6 @@ job_integration_geo_calendar: - zammad script: - export RAILS_ENV=test - - script/build/test_db_config.sh test ci_zammad_geo_calendar - rake db:drop; - rake db:create - rake db:migrate @@ -88,7 +84,6 @@ job_integration_user_agent: - zammad script: - export RAILS_ENV=test - - script/build/test_db_config.sh test ci_zammad_user_agent - rake db:drop; - rake db:create - rake db:migrate @@ -100,7 +95,6 @@ job_integration_es: - zammad script: - export RAILS_ENV=test - - script/build/test_db_config.sh test ci_zammad_es - rake db:drop; - rake db:create - rake db:migrate @@ -115,7 +109,6 @@ job_integration_otrs_5: script: - export RAILS_ENV=test - export IMPORT_OTRS_ENDPOINT="http://vz599.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" - - script/build/test_db_config.sh test ci_zammad_otrs5 - rake db:drop; - rake db:create - rake db:migrate @@ -128,7 +121,6 @@ job_integration_otrs_4: script: - export RAILS_ENV=test - export IMPORT_OTRS_ENDPOINT="http://vz383.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" - - script/build/test_db_config.sh test ci_zammad_otrs4 - rake db:drop; - rake db:create - rake db:migrate @@ -141,7 +133,6 @@ job_integration_otrs_33: script: - export RAILS_ENV=test - export IMPORT_OTRS_ENDPOINT="http://vz305.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" - - script/build/test_db_config.sh test ci_zammad_otrs33 - rake db:drop; - rake db:create - rake db:migrate @@ -154,7 +145,6 @@ job_integration_otrs_32: script: - export RAILS_ENV=test - export IMPORT_OTRS_ENDPOINT="http://vz382.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" - - script/build/test_db_config.sh test ci_zammad_otrs32 - rake db:drop; - rake db:create - rake db:migrate @@ -167,7 +157,6 @@ job_integration_otrs_31: script: - export RAILS_ENV=test - export IMPORT_OTRS_ENDPOINT="http://vz381.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" - - script/build/test_db_config.sh test ci_zammad_otrs31 - rake db:drop; - rake db:create - rake db:migrate @@ -179,8 +168,6 @@ job_integration_autowizard_ff: - browser-ff script: - export BROWSER_URL=http://$IP:3001 - - script/build/test_db_config.sh production ci_zammad_autowizard_ff - - script/build/test_db_config.sh test ci_zammad_autowizard_ff_test - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_example.json auto_wizard.json - script/bootstrap.sh @@ -199,8 +186,6 @@ job_integration_browser_ff_1: - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - - script/build/test_db_config.sh production ci_zammad_browser_ff_1 - - script/build/test_db_config.sh test ci_zammad_browser_ff_1_test - script/build/test_slice_tests.sh 1 - RAILS_ENV=test rake db:create - script/bootstrap.sh @@ -219,8 +204,6 @@ job_integration_browser_ff_2: - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - - script/build/test_db_config.sh production ci_zammad_browser_ff_2 - - script/build/test_db_config.sh test ci_zammad_browser_ff_2_test - script/build/test_slice_tests.sh 2 - RAILS_ENV=test rake db:create - script/bootstrap.sh @@ -235,8 +218,6 @@ job_integration_browser_ff_3: - browser-ff script: - export BROWSER_URL=http://$IP:3031 - - script/build/test_db_config.sh production ci_zammad_browser_ff_3 - - script/build/test_db_config.sh test ci_zammad_browser_ff_3_test - script/build/test_slice_tests.sh 3 - RAILS_ENV=test rake db:create - script/bootstrap.sh @@ -251,8 +232,6 @@ job_integration_autowizard_chrome: - browser-chrome script: - export BROWSER_URL=http://$IP:3071 - - script/build/test_db_config.sh production ci_zammad_autowizard_chrome - - script/build/test_db_config.sh test ci_zammad_autowizard_chrome_test - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_example.json auto_wizard.json - script/bootstrap.sh @@ -271,8 +250,6 @@ job_integration_browser_chrome_1: - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - - script/build/test_db_config.sh production ci_zammad_browser_chrome_1 - - script/build/test_db_config.sh test ci_zammad_browser_chrome_1_test - script/build/test_slice_tests.sh 1 - RAILS_ENV=test rake db:create - script/bootstrap.sh @@ -291,8 +268,6 @@ job_integration_browser_chrome_2: - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - - script/build/test_db_config.sh production ci_zammad_browser_chrome_2 - - script/build/test_db_config.sh test ci_zammad_browser_chrome_2_test - script/build/test_slice_tests.sh 2 - RAILS_ENV=test rake db:create - script/bootstrap.sh @@ -311,8 +286,6 @@ job_integration_browser_chrome_3: - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - - script/build/test_db_config.sh production ci_zammad_browser_chrome_3 - - script/build/test_db_config.sh test ci_zammad_browser_chrome_3_test - script/build/test_slice_tests.sh 3 - RAILS_ENV=test rake db:create - script/bootstrap.sh diff --git a/script/build/test_db_config.sh b/script/build/test_db_config.sh index 5c03f109b..8e95adbea 100755 --- a/script/build/test_db_config.sh +++ b/script/build/test_db_config.sh @@ -1,13 +1,37 @@ #!/bin/bash -DBENV=$1 -DBNAME=$2 + +if [ "$RNAME" == '' ]; then + echo "ERROR: Env RNAME is missing!" + exit 1 +fi + +DBNAME=$RNAME DBFILE=config/database.yml +DB_PRODUCTION="$DBNAME_production" +DB_TEST="$DBNAME_test" +DB_DEVELOPMENT="$DBNAME_development" -echo "Creating $DBFILE for tests with dbname $DBNAME" +echo "Creating $DBFILE for tests with $DBNAME" -echo "$DBENV:" >> $DBFILE +echo "production:" > $DBFILE echo " adapter: mysql2" >> $DBFILE -echo " database: $DBNAME" >> $DBFILE +echo " database: $DB_PRODUCTION" >> $DBFILE +echo " pool: 50" >> $DBFILE +echo " timeout: 5000" >> $DBFILE +echo " encoding: utf8" >> $DBFILE +echo " username: root" >> $DBFILE +echo " password:" >> $DBFILE +echo "test:" >> $DBFILE +echo " adapter: mysql2" >> $DBFILE +echo " database: $DB_TEST" >> $DBFILE +echo " pool: 50" >> $DBFILE +echo " timeout: 5000" >> $DBFILE +echo " encoding: utf8" >> $DBFILE +echo " username: root" >> $DBFILE +echo " password:" >> $DBFILE +echo "development:" >> $DBFILE +echo " adapter: mysql2" >> $DBFILE +echo " database: $DB_DEVELOPMENT" >> $DBFILE echo " pool: 50" >> $DBFILE echo " timeout: 5000" >> $DBFILE echo " encoding: utf8" >> $DBFILE