Merge branch 'fzimmer-master-patch-11180' into 'master'

SSOT for version specific update steps

See merge request gitlab-org/gitlab!40233

doc/administration/geo/replication/updating_the_geo_nodes.md

@@ -7,33 +7,15 @@ type: howto
 
 # Updating the Geo nodes **(PREMIUM ONLY)**
 
+CAUTION: **Warning:**
+Please ensure you read these sections carefully before updating your Geo nodes! Not following version-specific update steps may result in unexpected downtime. Please [contact support](https://about.gitlab.com/support/#contact-support) if you have any specific questions.
+
 Updating Geo nodes involves performing:
 
-1. [Version-specific update steps](#version-specific-update-steps), depending on the
+1. [Version-specific update steps](version_specific_updates.md), depending on the
    version being updated to or from.
 1. [General update steps](#general-update-steps), for all updates.
 
-## Version specific update steps
-
-Depending on which version of Geo you are updating to/from, there may be
-different steps.
-
-- [Updating to GitLab 12.9](version_specific_updates.md#updating-to-gitlab-129)
-- [Updating to GitLab 12.7](version_specific_updates.md#updating-to-gitlab-127)
-- [Updating to GitLab 12.2](version_specific_updates.md#updating-to-gitlab-122)
-- [Updating to GitLab 12.1](version_specific_updates.md#updating-to-gitlab-121)
-- [Updating to GitLab 12.0](version_specific_updates.md#updating-to-gitlab-120)
-- [Updating to GitLab 11.11](version_specific_updates.md#updating-to-gitlab-1111)
-- [Updating to GitLab 10.8](version_specific_updates.md#updating-to-gitlab-108)
-- [Updating to GitLab 10.6](version_specific_updates.md#updating-to-gitlab-106)
-- [Updating to GitLab 10.5](version_specific_updates.md#updating-to-gitlab-105)
-- [Updating to GitLab 10.3](version_specific_updates.md#updating-to-gitlab-103)
-- [Updating to GitLab 10.2](version_specific_updates.md#updating-to-gitlab-102)
-- [Updating to GitLab 10.1](version_specific_updates.md#updating-to-gitlab-101)
-- [Updating to GitLab 10.0](version_specific_updates.md#updating-to-gitlab-100)
-- [Updating from GitLab 9.3 or older](version_specific_updates.md#updating-from-gitlab-93-or-older)
-- [Updating to GitLab 9.0](version_specific_updates.md#updating-to-gitlab-90)
-
 ## General update steps
 
 NOTE: **Note:**

qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb

 # frozen_string_literal: true
+require_relative 'cluster_with_prometheus.rb'
 
 module QA
-  RSpec.describe 'Monitor' do
-    describe 'with Prometheus in a Gitlab-managed cluster', :orchestrated, :kubernetes, :requires_admin do
-      before :all do
-        @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
-        @project = Resource::Project.fabricate_via_api! do |project|
-          project.name = 'monitoring-project'
-          project.auto_devops_enabled = true
-          project.template_name = 'express'
-        end
-
-        deploy_project_with_prometheus
-      end
+  RSpec.describe 'Monitor', :orchestrated, :kubernetes, :requires_admin do
+    include_context "cluster with Prometheus installed"
 
     before do
       Flow::Login.sign_in_unless_signed_in
       @project.visit!
     end
 
-      after :all do
-        @cluster.remove!
-      end
-
     it 'configures custom metrics' do
       verify_add_custom_metric
       verify_edit_custom_metric
@@ -105,53 +92,6 @@ module QA
 
     private
 
-      def deploy_project_with_prometheus
-        %w[
-          CODE_QUALITY_DISABLED TEST_DISABLED LICENSE_MANAGEMENT_DISABLED
-          SAST_DISABLED DAST_DISABLED DEPENDENCY_SCANNING_DISABLED
-          CONTAINER_SCANNING_DISABLED PERFORMANCE_DISABLED SECRET_DETECTION_DISABLED
-        ].each do |key|
-          Resource::CiVariable.fabricate_via_api! do |resource|
-            resource.project = @project
-            resource.key = key
-            resource.value = '1'
-            resource.masked = false
-          end
-        end
-
-        Flow::Login.sign_in
-
-        Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
-          cluster_settings.project = @project
-          cluster_settings.cluster = @cluster
-          cluster_settings.install_runner = true
-          cluster_settings.install_ingress = true
-          cluster_settings.install_prometheus = true
-        end
-
-        Resource::Pipeline.fabricate_via_api! do |pipeline|
-          pipeline.project = @project
-        end.visit!
-
-        Page::Project::Pipeline::Show.perform do |pipeline|
-          pipeline.click_job('build')
-        end
-        Page::Project::Job::Show.perform do |job|
-          expect(job).to be_successful(timeout: 600)
-
-          job.click_element(:pipeline_path)
-        end
-
-        Page::Project::Pipeline::Show.perform do |pipeline|
-          pipeline.click_job('production')
-        end
-        Page::Project::Job::Show.perform do |job|
-          expect(job).to be_successful(timeout: 1200)
-
-          job.click_element(:pipeline_path)
-        end
-      end
-
     def verify_add_custom_metric
       Page::Project::Menu.perform(&:go_to_integrations_settings)
       Page::Project::Settings::Integrations.perform(&:click_on_prometheus_integration)
@@ -199,5 +139,4 @@ module QA
       end
     end
   end
-  end
 end

qa/qa/specs/features/browser_ui/8_monitor/cluster_with_prometheus.rb

+# frozen_string_literal: true
+
+module QA
+  RSpec.configure do |rspec|
+    # This config option will be enabled by default on RSpec 4,
+    # but for reasons of backwards compatibility, you have to
+    # set it on RSpec 3.
+    #
+    # It causes the host group and examples to inherit metadata
+    # from the shared context.
+    rspec.shared_context_metadata_behavior = :apply_to_host_groups
+  end
+
+  RSpec.shared_context "cluster with Prometheus installed", shared_context: :metadata do
+    before :all do
+      @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
+      @project = Resource::Project.fabricate_via_api! do |project|
+        project.name = 'monitoring-project'
+        project.auto_devops_enabled = true
+        project.template_name = 'express'
+      end
+
+      deploy_project_with_prometheus
+    end
+
+    def deploy_project_with_prometheus
+      %w[
+          CODE_QUALITY_DISABLED TEST_DISABLED LICENSE_MANAGEMENT_DISABLED
+          SAST_DISABLED DAST_DISABLED DEPENDENCY_SCANNING_DISABLED
+          CONTAINER_SCANNING_DISABLED PERFORMANCE_DISABLED SECRET_DETECTION_DISABLED
+        ].each do |key|
+        Resource::CiVariable.fabricate_via_api! do |resource|
+          resource.project = @project
+          resource.key = key
+          resource.value = '1'
+          resource.masked = false
+        end
+      end
+
+      Flow::Login.sign_in
+
+      Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
+        cluster_settings.project = @project
+        cluster_settings.cluster = @cluster
+        cluster_settings.install_runner = true
+        cluster_settings.install_ingress = true
+        cluster_settings.install_prometheus = true
+      end
+
+      Resource::Pipeline.fabricate_via_api! do |pipeline|
+        pipeline.project = @project
+      end.visit!
+
+      Page::Project::Pipeline::Show.perform do |pipeline|
+        pipeline.click_job('build')
+      end
+      Page::Project::Job::Show.perform do |job|
+        expect(job).to be_successful(timeout: 600)
+
+        job.click_element(:pipeline_path)
+      end
+
+      Page::Project::Pipeline::Show.perform do |pipeline|
+        pipeline.click_job('production')
+      end
+      Page::Project::Job::Show.perform do |job|
+        expect(job).to be_successful(timeout: 1200)
+
+        job.click_element(:pipeline_path)
+      end
+    end
+
+    after :all do
+      @cluster.remove!
+    end
+  end
+end

qa/qa/specs/features/ee/browser_ui/8_monitor/all_monitor_features_spec.rb

 # frozen_string_literal: true
 require 'pathname'
+require_relative 'cluster_with_prometheus.rb'
 
 module QA
-  RSpec.describe 'Monitor' do
-    describe 'with Prometheus in a Gitlab-managed cluster', :orchestrated, :kubernetes, :requires_admin do
-      before :all do
-        @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
-        @project = Resource::Project.fabricate_via_api! do |project|
-          project.name = 'monitoring-project'
-          project.auto_devops_enabled = true
-          project.template_name = 'express'
-        end
-
-        deploy_project_with_prometheus
-      end
-
-      after :all do
-        @cluster.remove!
-      end
+  RSpec.describe 'Monitor', :orchestrated, :kubernetes, :requires_admin do
+    include_context "cluster with Prometheus installed"
 
     before do
       Flow::Login.sign_in_unless_signed_in
@@ -58,53 +45,6 @@ module QA
 
     private
 
-      def deploy_project_with_prometheus
-        %w[
-          CODE_QUALITY_DISABLED TEST_DISABLED LICENSE_MANAGEMENT_DISABLED
-          SAST_DISABLED DAST_DISABLED DEPENDENCY_SCANNING_DISABLED
-          CONTAINER_SCANNING_DISABLED PERFORMANCE_DISABLED SECRET_DETECTION_DISABLED
-        ].each do |key|
-          Resource::CiVariable.fabricate_via_api! do |resource|
-            resource.project = @project
-            resource.key = key
-            resource.value = '1'
-            resource.masked = false
-          end
-        end
-
-        Flow::Login.sign_in
-
-        Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
-          cluster_settings.project = @project
-          cluster_settings.cluster = @cluster
-          cluster_settings.install_runner = true
-          cluster_settings.install_ingress = true
-          cluster_settings.install_prometheus = true
-        end
-
-        Resource::Pipeline.fabricate_via_api! do |pipeline|
-          pipeline.project = @project
-        end.visit!
-
-        Page::Project::Pipeline::Show.perform do |pipeline|
-          pipeline.click_job('build')
-        end
-        Page::Project::Job::Show.perform do |job|
-          expect(job).to be_successful(timeout: 600)
-
-          job.click_element(:pipeline_path)
-        end
-
-        Page::Project::Pipeline::Show.perform do |pipeline|
-          pipeline.click_job('production')
-        end
-        Page::Project::Job::Show.perform do |job|
-          expect(job).to be_successful(timeout: 1200)
-
-          job.click_element(:pipeline_path)
-        end
-      end
-
     def verify_metrics(on_dashboard)
       on_dashboard.wait_for_metrics
 
@@ -176,5 +116,4 @@ module QA
       end
     end
   end
-  end
 end

qa/qa/specs/features/ee/browser_ui/8_monitor/cluster_with_prometheus.rb

+# frozen_string_literal: true
+#
+module QA
+  RSpec.configure do |rspec|
+    # This config option will be enabled by default on RSpec 4,
+    # but for reasons of backwards compatibility, you have to
+    # set it on RSpec 3.
+    #
+    # It causes the host group and examples to inherit metadata
+    # from the shared context.
+    rspec.shared_context_metadata_behavior = :apply_to_host_groups
+  end
+
+  RSpec.shared_context "cluster with Prometheus installed", shared_context: :metadata do
+    before :all do
+      @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
+      @project = Resource::Project.fabricate_via_api! do |project|
+        project.name = 'monitoring-project'
+        project.auto_devops_enabled = true
+        project.template_name = 'express'
+      end
+
+      deploy_project_with_prometheus
+    end
+
+    def deploy_project_with_prometheus
+      %w[
+          CODE_QUALITY_DISABLED TEST_DISABLED LICENSE_MANAGEMENT_DISABLED
+          SAST_DISABLED DAST_DISABLED DEPENDENCY_SCANNING_DISABLED
+          CONTAINER_SCANNING_DISABLED PERFORMANCE_DISABLED SECRET_DETECTION_DISABLED
+        ].each do |key|
+        Resource::CiVariable.fabricate_via_api! do |resource|
+          resource.project = @project
+          resource.key = key
+          resource.value = '1'
+          resource.masked = false
+        end
+      end
+
+      Flow::Login.sign_in
+
+      Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
+        cluster_settings.project = @project
+        cluster_settings.cluster = @cluster
+        cluster_settings.install_runner = true
+        cluster_settings.install_ingress = true
+        cluster_settings.install_prometheus = true
+      end
+
+      Resource::Pipeline.fabricate_via_api! do |pipeline|
+        pipeline.project = @project
+      end.visit!
+
+      Page::Project::Pipeline::Show.perform do |pipeline|
+        pipeline.click_job('build')
+      end
+      Page::Project::Job::Show.perform do |job|
+        expect(job).to be_successful(timeout: 600)
+
+        job.click_element(:pipeline_path)
+      end
+
+      Page::Project::Pipeline::Show.perform do |pipeline|
+        pipeline.click_job('production')
+      end
+      Page::Project::Job::Show.perform do |job|
+        expect(job).to be_successful(timeout: 1200)
+
+        job.click_element(:pipeline_path)
+      end
+    end
+
+    after :all do
+      @cluster.remove!
+    end
+  end
+end