Merge branch '14-6-stable-ee-patch-7' into '14-6-stable-ee'

Prepare 14.6.7-ee release

See merge request gitlab-org/gitlab!83641

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

@@ -13,6 +13,9 @@
 .if-jh: &if-jh
   if: '$CI_PROJECT_PATH =~ /^gitlab-(jh|cn)\/.*/'
+.if-force-ci: &if-force-ci
+  if: '$FORCE_GITLAB_CI'
+
 .if-default-refs: &if-default-refs
   if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\// || $CI_MERGE_REQUEST_IID || $CI_COMMIT_TAG || $FORCE_GITLAB_CI'
@@ -481,6 +484,7 @@
     - <<: *if-dot-com-gitlab-org-default-branch
       changes: *code-qa-patterns
     - <<: *if-dot-com-gitlab-org-schedule
+    - <<: *if-force-ci
 .build-images:rules:build-assets-image:
   rules:
@@ -777,6 +781,9 @@
       allow_failure: true
     - <<: *if-dot-com-gitlab-org-schedule
       allow_failure: true
+    - <<: *if-force-ci
+      when: manual
+      allow_failure: true
 .qa:rules:package-and-qa:feature-flags:
   rules:

qa/qa/specs/features/ee/browser_ui/11_fulfillment/license/license_spec.rb

@@ -5,9 +5,8 @@ module QA
   RSpec.describe 'Fulfillment', :requires_admin, :skip_live_env, except: { job: 'review-qa-*' } do
     let(:user) { 'GitLab QA' }
-    let(:user_email) { 'gitlab-qa@gitlab.com' }
-    let(:company) { 'GitLab' }
-    let(:user_count) { 10000 }
+    let(:company) { 'QA User' }
+    let(:user_count) { 10_000 }
     let(:plan) { ULTIMATE_SELF_MANAGED }
     context 'Active license details' do
@@ -19,9 +18,9 @@ module QA
       it 'shows up in subscription page', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347607' do
         Gitlab::Page::Admin::Subscription.perform do |subscription|
           aggregate_failures do
-            expect { subscription.name }.to eventually_eq(user).within(max_duration: 30)
-            expect(subscription.email).to eq(user_email)
-            expect(subscription.company).to eq(company)
+            expect { subscription.subscription_details?}.to eventually_be_truthy.within(max_duration: 60)
+            expect(subscription.name).to eq(user)
+            expect(subscription.company).to include(company)
             expect(subscription.plan).to eq(plan[:name].capitalize)
             expect(subscription.users_in_subscription).to eq(user_count.to_s)
             expect(subscription_record_exists(plan, user_count, LICENSE_TYPE[:license_file])).to be(true)

qa/qa/specs/features/ee/browser_ui/2_plan/iterations/create_group_iteration_spec.rb

@@ -19,20 +19,17 @@ module QA
       before do
         Runtime::Feature.enable(:iteration_cadences, group: iteration_group)
+        # TODO: this sleep can be removed when the `Runtime::Feature.enable` method call is removed
+        # Wait for the application settings cache to update with iteration_cadences feature flag setting
+        # as per this issue https://gitlab.com/gitlab-org/gitlab/-/issues/36663
+        # We cannot check the UI for the changes because they are sporadically available at first
+        # as described in this issue https://gitlab.com/gitlab-org/quality/testcases/-/issues/113#note_300647725
+        sleep(60)
         Flow::Login.sign_in
       end
       it 'creates a group iteration', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347943' do
-        # TODO: Remove this retry when the `Runtime::Feature.enable` method call is removed
-        Support::Retrier.retry_until(max_duration: 60, retry_on_exception: true, sleep_interval: 5) do
-          iteration_group.visit!
-          QA::Page::Group::Menu.perform(&:go_to_group_iterations)
-          QA::EE::Page::Group::Iteration::Cadence::Index.perform do |cadence|
-            cadence.find_element(:create_new_cadence_button)
-          end
-        end
-
         EE::Resource::GroupIteration.fabricate_via_browser_ui! do |iteration|
           iteration.title = title
           iteration.description = description

qa/qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb

 # frozen_string_literal: true
 module QA
-  # TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
-  RSpec.describe 'Plan', :requires_admin do
+  RSpec.describe 'Plan' do
     describe 'Editing scoped labels on issues' do
       let(:initial_label) { 'animal::fox' }
       let(:new_label_same_scope) { 'animal::dolphin' }

spec/factories/ci/job_artifacts.rb

@@ -7,7 +7,7 @@ FactoryBot.define do
     file_format { :zip }
     trait :expired do
-      expire_at { Date.yesterday }
+      expire_at { Time.current.yesterday.change(minute: 9) }
     end
     trait :remote_store do

spec/models/ci/deleted_object_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Ci::DeletedObject, :aggregate_failures do
         expect(deleted_artifact.file_store).to eq(artifact.file_store)
         expect(deleted_artifact.store_dir).to eq(artifact.file.store_dir.to_s)
         expect(deleted_artifact.file_identifier).to eq(artifact.file_identifier)
-        expect(deleted_artifact.pick_up_at).to eq(artifact.expire_at)
+        expect(deleted_artifact.pick_up_at).to be_like_time(artifact.expire_at)
       end
     end