Merge branch 'minac_fix_master' into 'master'

Fix broken master

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145948



Merged-by: Mehmet Emin INAC <minac@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>

.gitlab/ci/build-images.gitlab-ci.yml

@@ -29,17 +29,6 @@ build-qa-image as-if-foss:
     - .as-if-foss
     - .build-images:rules:build-qa-image-as-if-foss
-build-gdk-image:
-  extends:
-    - .base-image-build-buildx
-    - .build-images:rules:build-gdk-image
-  tags:
-    - saas-linux-xlarge-amd64
-  stage: build-images
-  needs: []
-  script:
-    - run_timed_command "scripts/build_gdk_image"
-
 # NOTE: release-tools verifies the presence on this job for a commit that is
 # candidate to an auto-deploy package. This job name can't be changed without
 # changing the code in release-tools.

.gitlab/ci/qa.gitlab-ci.yml

@@ -199,18 +199,3 @@ e2e:package-and-test-nightly:
     QA_RUN_TYPE: nightly
     PIPELINE_NAME: E2E Omnibus GitLab Nightly
     DYNAMIC_PIPELINE_YML: package-and-test-nightly-pipeline.yml
-
-e2e:test-on-gdk:
-  extends:
-    - .e2e-trigger-base
-    - .qa:rules:e2e:test-on-gdk
-  stage: qa
-  needs:
-    - build-gdk-image
-    - e2e-test-pipeline-generate
-  variables:
-    QA_RUN_TYPE: e2e-test-on-gdk
-    PIPELINE_NAME: E2E GDK
-    DYNAMIC_PIPELINE_YML: test-on-gdk-pipeline.yml
-    SKIP_MESSAGE: Skipping test-on-gdk due to mr containing only quarantine changes!
-    GDK_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-qa-gdk:${CI_COMMIT_SHA}"

.gitlab/ci/rules.gitlab-ci.yml

@@ -2538,6 +2538,8 @@
       when: never
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
+    - if: '$CI_REVIEW_APPS_ENABLED != "true"'
+      when: never
     - <<: *if-merge-request-labels-run-review-app
     - <<: *if-dot-com-gitlab-org-merge-request
       changes: *ci-review-patterns

ee/spec/services/groups/compliance_report_csv_service_spec.rb

@@ -2,10 +2,11 @@
 require 'spec_helper'
-RSpec.describe Groups::ComplianceReportCsvService, feature_category: :compliance_management do
+RSpec.describe Groups::ComplianceReportCsvService, :freeze_time, feature_category: :compliance_management do
   subject(:service) { described_class.new(user, group, filters) }
-  let(:filters) { { from: 10.years.ago, to: Time.current } }
+  let(:from) { 10.years.ago }
+  let(:filters) { { from: from, to: Time.current } }
   let_it_be(:user) { create(:user, name: 'John Cena') }
@@ -107,9 +108,9 @@
     context 'when verifying the csv data' do
       let(:all_commits) do
-        commits = project1.repository.commits(nil, limit: 100).map(&:sha) +
-          project2.repository.commits(nil, limit: 100).map(&:sha) +
-          sub_group_project.repository.commits(nil, limit: 100).map(&:sha)
+        commits = project1.repository.commits(nil, limit: 100, after: from).map(&:sha) +
+          project2.repository.commits(nil, limit: 100, after: from).map(&:sha) +
+          sub_group_project.repository.commits(nil, limit: 100, after: from).map(&:sha)
         commits.sort.uniq
       end

lib/gitlab/sidekiq_config.rb

@@ -40,6 +40,7 @@ module SidekiqConfig
     class << self
       include Gitlab::SidekiqConfig::CliMethods
+      include Gitlab::Utils::StrongMemoize
       def redis_queues
         # Not memoized, because this can change during the life of the application
@@ -54,28 +55,27 @@ def config_queues
       end
       def cron_jobs
-        @cron_jobs ||= begin
-          Gitlab.config.load_dynamic_cron_schedules!
-
-          jobs = Gitlab.config.cron_jobs.to_hash
-
-          jobs.delete('poll_interval') # Would be interpreted as a job otherwise
-
-          # Settingslogic (former gem used for yaml configuration) didn't allow 'class' key
-          # Therefore, we configure cron jobs with `job_class` as a workaround.
-          required_keys = %w[job_class cron]
-          jobs.each do |k, v|
-            if jobs[k] && required_keys.all? { |s| jobs[k].key?(s) }
-              jobs[k]['class'] = jobs[k].delete('job_class')
-            else
-              jobs.delete(k)
-              Gitlab::AppLogger.error("Invalid cron_jobs config key: '#{k}'. Check your gitlab config file.")
-            end
-          end
-          jobs
+        Gitlab.config.load_dynamic_cron_schedules!
+
+        jobs = Gitlab.config.cron_jobs.to_hash
+
+        jobs.delete('poll_interval') # Would be interpreted as a job otherwise
+        # Settingslogic (former gem used for yaml configuration) didn't allow 'class' key
+        # Therefore, we configure cron jobs with `job_class` as a workaround.
+        required_keys = %w[job_class cron]
+        jobs.each do |k, v|
+          if jobs[k] && required_keys.all? { |s| jobs[k].key?(s) }
+            jobs[k]['class'] = jobs[k].delete('job_class')
+          else
+            jobs.delete(k)
+            Gitlab::AppLogger.error("Invalid cron_jobs config key: '#{k}'. Check your gitlab config file.")
+          end
         end
+
+        jobs
       end
+      strong_memoize_attr :cron_jobs
       def cron_workers
         @cron_workers ||= cron_jobs.map { |job_name, options| options['class'].constantize }

spec/initializers/sidekiq_spec.rb

@@ -78,11 +78,13 @@
     end
     around do |example|
+      Gitlab::SidekiqConfig.clear_memoization(:cron_jobs)
       original_settings = Gitlab.config['cron_jobs']
       Gitlab.config['cron_jobs'] = cron_jobs_settings
       example.run
+      Gitlab::SidekiqConfig.clear_memoization(:cron_jobs)
       Gitlab.config['cron_jobs'] = original_settings
     end

spec/lib/gitlab/sidekiq_config_spec.rb

@@ -18,6 +18,14 @@
   end
   describe '.cron_jobs' do
+    around do |example|
+      described_class.clear_memoization(:cron_jobs)
+
+      example.run
+
+      described_class.clear_memoization(:cron_jobs)
+    end
+
     it 'renames job_class to class and removes incomplete jobs' do
       expect(Gitlab)
         .to receive(:config)