gitlab-qa 7.24.4 → 7.25.0

data/support/data/license_usage_seed.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+# rubocop:disable Metrics/AbcSize
+
+class LicenseUsageSeed
+  def self.seed!
+    admin_user = User.find_by(username: 'root')
+    group_count = seed_groups.count
+    user_count = seed_users.count
+
+    puts 'Start seeding license usage data...'
+
+    rand(5..20).times { create_group(admin_user) }
+    create_users_and_members
+
+    puts 'Creating License usage record...'
+    create_license_usage_record
+
+    puts "Created #{seed_users.count - user_count} users and #{seed_groups.count - group_count} groups."
+    puts 'License usage data seeding completed.'
+  end
+
+  def self.create_user
+    name = "test-user#{SecureRandom.hex(8)}"
+
+    User.create!(
+      email: "#{name}@test.com",
+      password: 'password',
+      username: name,
+      name: "User #{name}",
+      confirmed_at: Time.current
+    )
+  end
+
+  def self.create_group(user)
+    name = "test-group#{SecureRandom.hex(8)}"
+    group_params =
+      {
+        name: name,
+        path: name
+      }
+    ::Groups::CreateService.new(user, group_params).execute
+  end
+
+  def self.create_users_and_members
+    seed_groups.pluck(:id).each do |group_id|
+      3.times { create_member(create_user, group_id) }
+    end
+  end
+
+  def self.create_member(user, group_id)
+    roles = Gitlab::Access.values
+
+    GroupMember.create(user_id: user.id, access_level: roles.sample, source_id: group_id)
+  end
+
+  def self.seed_users
+    User.where('username ~* ?', '^test-user')
+  end
+
+  def self.seed_groups
+    Group.where('name ~* ?', '^test-group')
+  end
+
+  def self.create_license_usage_record
+    # Force update daily billable users and historical license data
+    identifier = Analytics::UsageTrends::Measurement.identifiers[:billable_users]
+    ::Analytics::UsageTrends::CounterJobWorker.new.perform(identifier, User.minimum(:id), User.maximum(:id), Time.zone.now)
+
+    HistoricalData.track!
+  end
+end
+
+LicenseUsageSeed.seed!
+
+# rubocop:enable Metrics/AbcSize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.24.4
+  version: 7.25.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: gitlab-styles
   requirement: !ruby/object:Gem::Requirement
@@ -218,8 +218,9 @@ files:
 - ".dockerignore"
 - ".gitignore"
 - ".gitlab-ci.yml"
-- ".gitlab/ci/danger.gitlab-ci.yml"
 - ".gitlab/ci/rules.gitlab-ci.yml"
+- ".gitlab/issue_templates/Default.md"
+- ".gitlab/merge_request_templates/Default.md"
 - ".gitlab/merge_request_templates/Release.md"
 - ".rspec"
 - ".rubocop.yml"
@@ -324,6 +325,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/staging.rb
 - lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/instance/staging_ref.rb
+- lib/gitlab/qa/scenario/test/instance/staging_ref_geo.rb
 - lib/gitlab/qa/scenario/test/integration/actioncable.rb
 - lib/gitlab/qa/scenario/test/integration/client_ssl.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
@@ -343,6 +345,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/praefect.rb
 - lib/gitlab/qa/scenario/test/integration/registry.rb
 - lib/gitlab/qa/scenario/test/integration/registry_tls.rb
+- lib/gitlab/qa/scenario/test/integration/registry_with_cdn.rb
 - lib/gitlab/qa/scenario/test/integration/saml.rb
 - lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
@@ -358,6 +361,8 @@ files:
 - lib/gitlab/qa/support/invalid_response_error.rb
 - lib/gitlab/qa/test_logger.rb
 - lib/gitlab/qa/version.rb
+- scripts/generate-qa-jobs.rb
+- support/data/license_usage_seed.rb
 - tls_certificates/authority/ca.crt
 - tls_certificates/authority/ca.key
 - tls_certificates/authority/ca.pem

data/.gitlab/ci/danger.gitlab-ci.yml

@@ -1,25 +0,0 @@
-danger-review:
-  image: ruby:3.0
-  stage: check
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-  needs: []
-  retry:
-    max: 2
-    when:
-      - unknown_failure
-      - api_failure
-      - runner_system_failure
-      - stuck_or_timeout_failure
-  before_script:
-    - bundle install
-  script:
-    - >
-      if [ -z "$DANGER_GITLAB_API_TOKEN" ]; then
-        # Force danger to skip CI source GitLab and fallback to "local only git repo".
-        unset GITLAB_CI
-        # We need the base SHA of the merge request diff to help danger determine the base commit for this shallow clone.
-        bundle exec danger dry_run --fail-on-errors=true --verbose --base='$CI_MERGE_REQUEST_DIFF_BASE_SHA' --head='${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA:-$CI_COMMIT_SHA}'
-      else
-        bundle exec danger --fail-on-errors=true --verbose
-      fi