Commit 91cb64bf authored by Robert Speicher's avatar Robert Speicher

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
parents 0f506f77 ad88e3f8
...@@ -517,10 +517,12 @@ db:rollback-mysql: ...@@ -517,10 +517,12 @@ db:rollback-mysql:
SIZE: "1" SIZE: "1"
SETUP_DB: "false" SETUP_DB: "false"
CREATE_DB_USER: "true" CREATE_DB_USER: "true"
FIXTURE_PATH: db/fixtures/development
script: script:
- git clone https://gitlab.com/gitlab-org/gitlab-test.git - git clone https://gitlab.com/gitlab-org/gitlab-test.git
/home/git/repositories/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: artifacts:
when: on_failure when: on_failure
expire_in: 1d expire_in: 1d
......
...@@ -8,7 +8,7 @@ end ...@@ -8,7 +8,7 @@ end
module Gitlab module Gitlab
class Seeder class Seeder
def self.quiet def self.quiet
mute_mailer unless Rails.env.test? mute_mailer
SeedFu.quiet = true SeedFu.quiet = true
......
#!/bin/bash #!/bin/bash
mysql --user=root --host=mysql <<EOF 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'@'%'; CREATE USER IF NOT EXISTS 'gitlab'@'%';
GRANT ALL PRIVILEGES ON gitlabhq_test.* TO 'gitlab'@'%'; GRANT ALL PRIVILEGES ON gitlabhq_test.* TO 'gitlab'@'%';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment