diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-03 17:25:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-03 17:25:44 +0000 |
| commit | 91cb64bf0fb3096f07174585f5a0e3db69181571 (patch) | |
| tree | 0d7b5676dfa877fd36d1783199e96a3aa58a5492 | |
| parent | 0f506f778daa63d35e70a4e604b778395607cb84 (diff) | |
| parent | ad88e3f88d2ac287f5a95952f95da4feae90944e (diff) | |
| download | gitlab-ce-91cb64bf0fb3096f07174585f5a0e3db69181571.tar.gz | |
Merge branch 'sh-fix-seed-fu-ci' into 'master'
Fix `rake db:seed_fu` not doing anything in CI
Closes #41517
See merge request gitlab-org/gitlab-ce!16146
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/seeder.rb | 2 | ||||
| -rw-r--r-- | scripts/create_mysql_user.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ca2fb471aa..e98ac200332 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -517,10 +517,12 @@ db:rollback-mysql: SIZE: "1" SETUP_DB: "false" CREATE_DB_USER: "true" + FIXTURE_PATH: db/fixtures/development script: - git clone https://gitlab.com/gitlab-org/gitlab-test.git /home/git/repositories/gitlab-org/gitlab-test.git - - bundle exec rake db:setup db:seed_fu + - scripts/gitaly-test-spawn + - force=yes bundle exec rake gitlab:setup artifacts: when: on_failure expire_in: 1d diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb index 30df7e4a831..94a481a0f2e 100644 --- a/lib/gitlab/seeder.rb +++ b/lib/gitlab/seeder.rb @@ -8,7 +8,7 @@ end module Gitlab class Seeder def self.quiet - mute_mailer unless Rails.env.test? + mute_mailer SeedFu.quiet = true diff --git a/scripts/create_mysql_user.sh b/scripts/create_mysql_user.sh index 28f6cfb50ae..286b1325f1d 100644 --- a/scripts/create_mysql_user.sh +++ b/scripts/create_mysql_user.sh @@ -1,7 +1,7 @@ #!/bin/bash mysql --user=root --host=mysql <<EOF -CREATE DATABASE IF NOT EXISTS gitlabhq_test; +CREATE DATABASE IF NOT EXISTS gitlabhq_test DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; CREATE USER IF NOT EXISTS 'gitlab'@'%'; GRANT ALL PRIVILEGES ON gitlabhq_test.* TO 'gitlab'@'%'; FLUSH PRIVILEGES; |