diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /db/fixtures | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'db/fixtures')
-rw-r--r-- | db/fixtures/development/17_cycle_analytics.rb | 14 | ||||
-rw-r--r-- | db/fixtures/development/19_environments.rb | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb index 57993061c58..826e703a443 100644 --- a/db/fixtures/development/17_cycle_analytics.rb +++ b/db/fixtures/development/17_cycle_analytics.rb @@ -7,21 +7,21 @@ require './spec/support/helpers/test_env' # # Simple invocation always creates a new project: # -# FILTER=cycle_analytics SEED_CYCLE_ANALYTICS=1 bundle exec rake db:seed_fu +# FILTER=cycle_analytics SEED_VSA=1 bundle exec rake db:seed_fu # # Create more issues/MRs: # -# CYCLE_ANALYTICS_ISSUE_COUNT=100 FILTER=cycle_analytics SEED_CYCLE_ANALYTICS=1 bundle exec rake db:seed_fu +# VSA_ISSUE_COUNT=100 FILTER=cycle_analytics SEED_VSA=1 bundle exec rake db:seed_fu # # Run for an existing project # -# CYCLE_ANALYTICS_SEED_PROJECT_ID=10 FILTER=cycle_analytics SEED_CYCLE_ANALYTICS=1 bundle exec rake db:seed_fu +# VSA_SEED_PROJECT_ID=10 FILTER=cycle_analytics SEED_VSA=1 bundle exec rake db:seed_fu class Gitlab::Seeder::CycleAnalytics attr_reader :project, :issues, :merge_requests, :developers - FLAG = 'SEED_CYCLE_ANALYTICS' - PERF_TEST = 'CYCLE_ANALYTICS_PERF_TEST' + FLAG = 'SEED_VSA' + PERF_TEST = 'VSA_PERF_TEST' ISSUE_STAGE_MAX_DURATION_IN_HOURS = 72 PLAN_STAGE_MAX_DURATION_IN_HOURS = 48 @@ -40,7 +40,7 @@ class Gitlab::Seeder::CycleAnalytics def initialize(project: nil, perf: false) @project = project || create_new_vsm_project - @issue_count = perf ? 1000 : ENV.fetch('CYCLE_ANALYTICS_ISSUE_COUNT', 5).to_i + @issue_count = perf ? 1000 : ENV.fetch('VSA_ISSUE_COUNT', 5).to_i @issues = [] @merge_requests = [] @developers = [] @@ -195,7 +195,7 @@ class Gitlab::Seeder::CycleAnalytics end Gitlab::Seeder.quiet do - project_id = ENV['CYCLE_ANALYTICS_SEED_PROJECT_ID'] + project_id = ENV['VSA_SEED_PROJECT_ID'] project = Project.find(project_id) if project_id seeder = Gitlab::Seeder::CycleAnalytics.seeder_based_on_env(project) diff --git a/db/fixtures/development/19_environments.rb b/db/fixtures/development/19_environments.rb index 124f9d74ddd..0f9188164c9 100644 --- a/db/fixtures/development/19_environments.rb +++ b/db/fixtures/development/19_environments.rb @@ -6,7 +6,6 @@ class Gitlab::Seeder::Environments end def seed! - @project.create_mock_deployment_service!(active: true) @project.create_mock_monitoring_service!(active: true) create_master_deployments!('production') |