diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f27487e0..da40f181c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,12 @@ before_script: - bundle install stages: + - pre - test - browser rubocop: - stage: test + stage: pre script: - bundle exec rubocop @@ -150,9 +151,10 @@ job_integration_autowizard: - export BROWSER=firefox - export RAILS_SERVE_STATIC_FILES=true - script/build/test_db_config.sh production ci_zammad_autowizard + - script/build/test_db_config.sh test ci_zammad_autowizard_test - cp contrib/auto_wizard_example.json auto_wizard.json - script/bootstrap.sh - rake assets:precompile - script/build/test_startup.sh $RAILS_ENV 3011 - - ruby -I test/ test/integration/auto_wizard_test.rb + - ruby -I test/ test/integration/auto_wizard_test.rb || script/build/test_shutdown.sh $RAILS_ENV 3011 && exit 1 - script/build/test_shutdown.sh $RAILS_ENV 3011 diff --git a/script/build/test_db_config.sh b/script/build/test_db_config.sh index f660758d2..5c03f109b 100755 --- a/script/build/test_db_config.sh +++ b/script/build/test_db_config.sh @@ -5,7 +5,7 @@ DBFILE=config/database.yml echo "Creating $DBFILE for tests with dbname $DBNAME" -echo "$DBENV:" > $DBFILE +echo "$DBENV:" >> $DBFILE echo " adapter: mysql2" >> $DBFILE echo " database: $DBNAME" >> $DBFILE echo " pool: 50" >> $DBFILE