diff --git a/spec/chef/consul/resources/consul_service_spec.rb b/spec/chef/consul/resources/consul_service_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2NvbnN1bC9yZXNvdXJjZXMvY29uc3VsX3NlcnZpY2Vfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2NvbnN1bC9yZXNvdXJjZXMvY29uc3VsX3NlcnZpY2Vfc3BlYy5yYg== 100644
--- a/spec/chef/consul/resources/consul_service_spec.rb
+++ b/spec/chef/consul/resources/consul_service_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'consul_service' do
+RSpec.describe 'consul_service' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(consul_service))
   end
diff --git a/spec/chef/crond/resources/crond_job_spec.rb b/spec/chef/crond/resources/crond_job_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2Nyb25kL3Jlc291cmNlcy9jcm9uZF9qb2Jfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2Nyb25kL3Jlc291cmNlcy9jcm9uZF9qb2Jfc3BlYy5yYg== 100644
--- a/spec/chef/crond/resources/crond_job_spec.rb
+++ b/spec/chef/crond/resources/crond_job_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'crond_job' do
+RSpec.describe 'crond_job' do
   context 'crond enabled' do
     let(:runner) do
       ChefSpec::SoloRunner.new(step_into: %w(crond_job)) do |node|
diff --git a/spec/chef/gitlab-ee/libraries/fdw_helper_spec.rb b/spec/chef/gitlab-ee/libraries/fdw_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9saWJyYXJpZXMvZmR3X2hlbHBlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9saWJyYXJpZXMvZmR3X2hlbHBlcl9zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/libraries/fdw_helper_spec.rb
+++ b/spec/chef/gitlab-ee/libraries/fdw_helper_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../../../files/gitlab-cookbooks/gitlab-ee/libraries/fdw_helper.rb'
 require 'chef_helper'
 
-describe FdwHelper do
+RSpec.describe FdwHelper do
   let(:chef_run) { converge_config(is_ee: true) }
   subject { described_class.new(chef_run.node) }
 
diff --git a/spec/chef/gitlab-ee/libraries/gitlab_geo_helper_spec.rb b/spec/chef/gitlab-ee/libraries/gitlab_geo_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9saWJyYXJpZXMvZ2l0bGFiX2dlb19oZWxwZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9saWJyYXJpZXMvZ2l0bGFiX2dlb19oZWxwZXJfc3BlYy5yYg== 100644
--- a/spec/chef/gitlab-ee/libraries/gitlab_geo_helper_spec.rb
+++ b/spec/chef/gitlab-ee/libraries/gitlab_geo_helper_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../../../files/gitlab-cookbooks/gitlab-ee/libraries/gitlab_geo_helper.rb'
 require 'chef_helper'
 
-describe GitlabGeoHelper do
+RSpec.describe GitlabGeoHelper do
   cached(:chef_run) { converge_config(is_ee: true) }
   subject { described_class.new(chef_run.node) }
 
diff --git a/spec/chef/gitlab-ee/libraries/pgbouncer_helper_spec.rb b/spec/chef/gitlab-ee/libraries/pgbouncer_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9saWJyYXJpZXMvcGdib3VuY2VyX2hlbHBlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9saWJyYXJpZXMvcGdib3VuY2VyX2hlbHBlcl9zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/libraries/pgbouncer_helper_spec.rb
+++ b/spec/chef/gitlab-ee/libraries/pgbouncer_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe PgbouncerHelper do
+RSpec.describe PgbouncerHelper do
   let(:chef_run) { converge_config(is_ee: true) }
   subject { described_class.new(chef_run.node) }
 
diff --git a/spec/chef/gitlab-ee/recipes/consul_spec.rb b/spec/chef/gitlab-ee/recipes/consul_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2NvbnN1bF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2NvbnN1bF9zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/recipes/consul_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/consul_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'consul' do
+RSpec.describe 'consul' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab-ee::default') }
   let(:consul_conf) { '/var/opt/gitlab/consul/config.json' }
 
diff --git a/spec/chef/gitlab-ee/recipes/default_spec.rb b/spec/chef/gitlab-ee/recipes/default_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2RlZmF1bHRfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2RlZmF1bHRfc3BlYy5yYg== 100644
--- a/spec/chef/gitlab-ee/recipes/default_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/default_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab-ee::default' do
+RSpec.describe 'gitlab-ee::default' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab-ee::default') }
 
   before do
diff --git a/spec/chef/gitlab-ee/recipes/geo-logcursor_spec.rb b/spec/chef/gitlab-ee/recipes/geo-logcursor_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1sb2djdXJzb3Jfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1sb2djdXJzb3Jfc3BlYy5yYg== 100644
--- a/spec/chef/gitlab-ee/recipes/geo-logcursor_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/geo-logcursor_spec.rb
@@ -16,7 +16,7 @@
 
 require 'chef_helper'
 
-describe 'gitlab-ee::geo-logcursor' do
+RSpec.describe 'gitlab-ee::geo-logcursor' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab-ee::default') }
 
   before do
diff --git a/spec/chef/gitlab-ee/recipes/geo-postgresql_spec.rb b/spec/chef/gitlab-ee/recipes/geo-postgresql_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1wb3N0Z3Jlc3FsX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1wb3N0Z3Jlc3FsX3NwZWMucmI= 100644
--- a/spec/chef/gitlab-ee/recipes/geo-postgresql_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/geo-postgresql_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'geo postgresql 9.2' do
+RSpec.describe 'geo postgresql 9.2' do
   let(:postgresql_conf) { '/var/opt/gitlab/geo-postgresql/data/postgresql.conf' }
   let(:runtime_conf) { '/var/opt/gitlab/geo-postgresql/data/runtime.conf' }
 
@@ -276,7 +276,7 @@
   end
 end
 
-describe 'geo postgresql 9.6' do
+RSpec.describe 'geo postgresql 9.6' do
   let(:postgresql_conf) { '/var/opt/gitlab/geo-postgresql/data/postgresql.conf' }
   let(:runtime_conf) { '/var/opt/gitlab/geo-postgresql/data/runtime.conf' }
 
diff --git a/spec/chef/gitlab-ee/recipes/geo-secondary_disable_spec.rb b/spec/chef/gitlab-ee/recipes/geo-secondary_disable_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1zZWNvbmRhcnlfZGlzYWJsZV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1zZWNvbmRhcnlfZGlzYWJsZV9zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/recipes/geo-secondary_disable_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/geo-secondary_disable_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab-ee::geo-secondary_disable' do
+RSpec.describe 'gitlab-ee::geo-secondary_disable' do
   before do
     allow(Gitlab).to receive(:[]).and_call_original
   end
diff --git a/spec/chef/gitlab-ee/recipes/geo-secondary_spec.rb b/spec/chef/gitlab-ee/recipes/geo-secondary_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1zZWNvbmRhcnlfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlby1zZWNvbmRhcnlfc3BlYy5yYg== 100644
--- a/spec/chef/gitlab-ee/recipes/geo-secondary_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/geo-secondary_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab-ee::geo-secondary' do
+RSpec.describe 'gitlab-ee::geo-secondary' do
   before do
     allow(Gitlab).to receive(:[]).and_call_original
   end
diff --git a/spec/chef/gitlab-ee/recipes/geo_database_migrations_spec.rb b/spec/chef/gitlab-ee/recipes/geo_database_migrations_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlb19kYXRhYmFzZV9taWdyYXRpb25zX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlb19kYXRhYmFzZV9taWdyYXRpb25zX3NwZWMucmI= 100644
--- a/spec/chef/gitlab-ee/recipes/geo_database_migrations_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/geo_database_migrations_spec.rb
@@ -6,7 +6,7 @@
 # to the bash block.
 #
 
-describe 'gitlab-ee::geo-database-migrations' do
+RSpec.describe 'gitlab-ee::geo-database-migrations' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab-ee::default') }
   let(:name) { 'migrate gitlab-geo tracking database' }
 
diff --git a/spec/chef/gitlab-ee/recipes/geo_spec.rb b/spec/chef/gitlab-ee/recipes/geo_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlb19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL2dlb19zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/recipes/geo_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/geo_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab-ee::geo' do
+RSpec.describe 'gitlab-ee::geo' do
   let(:node) { chef_run.node }
 
   before do
diff --git a/spec/chef/gitlab-ee/recipes/patroni_spec.rb b/spec/chef/gitlab-ee/recipes/patroni_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BhdHJvbmlfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BhdHJvbmlfc3BlYy5yYg== 100644
--- a/spec/chef/gitlab-ee/recipes/patroni_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/patroni_spec.rb
@@ -1,7 +1,7 @@
 require 'chef_helper'
 require 'yaml'
 
-describe 'patroni cookbook' do
+RSpec.describe 'patroni cookbook' do
   before do
     allow(Gitlab).to receive(:[]).and_call_original
   end
diff --git a/spec/chef/gitlab-ee/recipes/pgbouncer-exporter_spec.rb b/spec/chef/gitlab-ee/recipes/pgbouncer-exporter_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BnYm91bmNlci1leHBvcnRlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BnYm91bmNlci1leHBvcnRlcl9zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/recipes/pgbouncer-exporter_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/pgbouncer-exporter_spec.rb
@@ -15,7 +15,7 @@
 #
 require 'chef_helper'
 
-describe 'gitlab-ee::pgbouncer-exporter' do
+RSpec.describe 'gitlab-ee::pgbouncer-exporter' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab-ee::default') }
   let(:config_yaml) { '/var/opt/gitlab/pgbouncer-exporter/pgbouncer-exporter.yaml' }
   let(:default_vars) do
diff --git a/spec/chef/gitlab-ee/recipes/pgbouncer_spec.rb b/spec/chef/gitlab-ee/recipes/pgbouncer_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BnYm91bmNlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BnYm91bmNlcl9zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/recipes/pgbouncer_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/pgbouncer_spec.rb
@@ -15,7 +15,7 @@
 #
 require 'chef_helper'
 
-describe 'gitlab-ee::pgbouncer' do
+RSpec.describe 'gitlab-ee::pgbouncer' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab-ee::default') }
   let(:pgbouncer_ini) { '/var/opt/gitlab/pgbouncer/pgbouncer.ini' }
   let(:databases_json) { '/var/opt/gitlab/pgbouncer/databases.json' }
@@ -309,7 +309,7 @@
   end
 end
 
-describe 'gitlab-ee::default' do
+RSpec.describe 'gitlab-ee::default' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab-ee::default') }
 
   before do
diff --git a/spec/chef/gitlab-ee/recipes/pgbouncer_user_spec.rb b/spec/chef/gitlab-ee/recipes/pgbouncer_user_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BnYm91bmNlcl91c2VyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3BnYm91bmNlcl91c2VyX3NwZWMucmI= 100644
--- a/spec/chef/gitlab-ee/recipes/pgbouncer_user_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/pgbouncer_user_spec.rb
@@ -16,7 +16,7 @@
 
 require 'chef_helper'
 
-describe 'gitlab-ee::pgbouncer_user' do
+RSpec.describe 'gitlab-ee::pgbouncer_user' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab-ee::default') }
   before do
     allow(Gitlab).to receive(:[]).and_call_original
diff --git a/spec/chef/gitlab-ee/recipes/repmgr_spec.rb b/spec/chef/gitlab-ee/recipes/repmgr_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3JlcG1ncl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3JlcG1ncl9zcGVjLnJi 100644
--- a/spec/chef/gitlab-ee/recipes/repmgr_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/repmgr_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'repmgr' do
+RSpec.describe 'repmgr' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service postgresql_config)).converge('gitlab-ee::default') }
 
   let(:repmgr_conf) { '/var/opt/gitlab/postgresql/repmgr.conf' }
diff --git a/spec/chef/gitlab-ee/recipes/sentinel_spec.rb b/spec/chef/gitlab-ee/recipes/sentinel_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3NlbnRpbmVsX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZWNpcGVzL3NlbnRpbmVsX3NwZWMucmI= 100644
--- a/spec/chef/gitlab-ee/recipes/sentinel_spec.rb
+++ b/spec/chef/gitlab-ee/recipes/sentinel_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::redis' do
+RSpec.describe 'gitlab::redis' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(sentinel_service runit_service)).converge('gitlab-ee::default') }
   let(:redis_master_ip) { '1.1.1.1' }
   let(:redis_announce_ip) { '10.10.10.10' }
diff --git a/spec/chef/gitlab-ee/resources/pgbouncer_user_spec.rb b/spec/chef/gitlab-ee/resources/pgbouncer_user_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZXNvdXJjZXMvcGdib3VuY2VyX3VzZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZXNvdXJjZXMvcGdib3VuY2VyX3VzZXJfc3BlYy5yYg== 100644
--- a/spec/chef/gitlab-ee/resources/pgbouncer_user_spec.rb
+++ b/spec/chef/gitlab-ee/resources/pgbouncer_user_spec.rb
@@ -1,5 +1,5 @@
 require 'chef_helper'
-describe 'pgbouncer_user' do
+RSpec.describe 'pgbouncer_user' do
   let(:runner) { ChefSpec::SoloRunner.new(step_into: ['pgbouncer_user']) }
 
   context 'create geo' do
diff --git a/spec/chef/gitlab-ee/resources/postgresql_fdw_spec.rb b/spec/chef/gitlab-ee/resources/postgresql_fdw_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZXNvdXJjZXMvcG9zdGdyZXNxbF9mZHdfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZXNvdXJjZXMvcG9zdGdyZXNxbF9mZHdfc3BlYy5yYg== 100644
--- a/spec/chef/gitlab-ee/resources/postgresql_fdw_spec.rb
+++ b/spec/chef/gitlab-ee/resources/postgresql_fdw_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_fdw' do
+RSpec.describe 'postgresql_fdw' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(postgresql_fdw))
   end
diff --git a/spec/chef/gitlab-ee/resources/postgresql_fdw_user_mapping_spec.rb b/spec/chef/gitlab-ee/resources/postgresql_fdw_user_mapping_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZXNvdXJjZXMvcG9zdGdyZXNxbF9mZHdfdXNlcl9tYXBwaW5nX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2dpdGxhYi1lZS9yZXNvdXJjZXMvcG9zdGdyZXNxbF9mZHdfdXNlcl9tYXBwaW5nX3NwZWMucmI= 100644
--- a/spec/chef/gitlab-ee/resources/postgresql_fdw_user_mapping_spec.rb
+++ b/spec/chef/gitlab-ee/resources/postgresql_fdw_user_mapping_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_fdw_user_mapping' do
+RSpec.describe 'postgresql_fdw_user_mapping' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(postgresql_fdw_user_mapping))
   end
diff --git a/spec/chef/letsencrypt/resources/letsencrypt_certificate_spec.rb b/spec/chef/letsencrypt/resources/letsencrypt_certificate_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL2xldHNlbmNyeXB0L3Jlc291cmNlcy9sZXRzZW5jcnlwdF9jZXJ0aWZpY2F0ZV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL2xldHNlbmNyeXB0L3Jlc291cmNlcy9sZXRzZW5jcnlwdF9jZXJ0aWZpY2F0ZV9zcGVjLnJi 100644
--- a/spec/chef/letsencrypt/resources/letsencrypt_certificate_spec.rb
+++ b/spec/chef/letsencrypt/resources/letsencrypt_certificate_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::letsencrypt' do
+RSpec.describe 'gitlab::letsencrypt' do
   let(:chef_run) do
     ChefSpec::SoloRunner.new(step_into: %(letsencrypt_certificate)).converge('gitlab::default')
   end
diff --git a/spec/chef/monitoring/alertmanager_spec.rb b/spec/chef/monitoring/alertmanager_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvYWxlcnRtYW5hZ2VyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvYWxlcnRtYW5hZ2VyX3NwZWMucmI= 100644
--- a/spec/chef/monitoring/alertmanager_spec.rb
+++ b/spec/chef/monitoring/alertmanager_spec.rb
@@ -16,7 +16,7 @@
   inhibit_rules: []
 ALERTMANAGERYML
 
-describe 'monitoring::alertmanager' do
+RSpec.describe 'monitoring::alertmanager' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:default_vars) do
     {
diff --git a/spec/chef/monitoring/gitlab-exporter_spec.rb b/spec/chef/monitoring/gitlab-exporter_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvZ2l0bGFiLWV4cG9ydGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvZ2l0bGFiLWV4cG9ydGVyX3NwZWMucmI= 100644
--- a/spec/chef/monitoring/gitlab-exporter_spec.rb
+++ b/spec/chef/monitoring/gitlab-exporter_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'monitoring::gitlab-exporter' do
+RSpec.describe 'monitoring::gitlab-exporter' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/monitoring/grafana_spec.rb b/spec/chef/monitoring/grafana_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvZ3JhZmFuYV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvZ3JhZmFuYV9zcGVjLnJi 100644
--- a/spec/chef/monitoring/grafana_spec.rb
+++ b/spec/chef/monitoring/grafana_spec.rb
@@ -24,7 +24,7 @@
   url: http://localhost:9090
 DATASOURCEYML
 
-describe 'monitoring::grafana' do
+RSpec.describe 'monitoring::grafana' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:default_vars) do
     {
diff --git a/spec/chef/monitoring/libraries/prometheus_helper_spec.rb b/spec/chef/monitoring/libraries/prometheus_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvbGlicmFyaWVzL3Byb21ldGhldXNfaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvbGlicmFyaWVzL3Byb21ldGhldXNfaGVscGVyX3NwZWMucmI= 100644
--- a/spec/chef/monitoring/libraries/prometheus_helper_spec.rb
+++ b/spec/chef/monitoring/libraries/prometheus_helper_spec.rb
@@ -16,7 +16,7 @@
 
 require 'chef_helper'
 
-describe PrometheusHelper do
+RSpec.describe PrometheusHelper do
   let(:chef_run) { ChefSpec::SoloRunner.new }
   subject { described_class.new(chef_run.node) }
 
diff --git a/spec/chef/monitoring/libraries/prometheus_spec.rb b/spec/chef/monitoring/libraries/prometheus_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvbGlicmFyaWVzL3Byb21ldGhldXNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvbGlicmFyaWVzL3Byb21ldGhldXNfc3BlYy5yYg== 100644
--- a/spec/chef/monitoring/libraries/prometheus_spec.rb
+++ b/spec/chef/monitoring/libraries/prometheus_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe Prometheus do
+RSpec.describe Prometheus do
   before { Services.add_services('gitlab', Services::BaseServices.list) }
 
   it 'should return a list of known services' do
diff --git a/spec/chef/monitoring/node-exporter_spec.rb b/spec/chef/monitoring/node-exporter_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3Jpbmcvbm9kZS1leHBvcnRlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3Jpbmcvbm9kZS1leHBvcnRlcl9zcGVjLnJi 100644
--- a/spec/chef/monitoring/node-exporter_spec.rb
+++ b/spec/chef/monitoring/node-exporter_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'monitoring::node-exporter' do
+RSpec.describe 'monitoring::node-exporter' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:default_vars) do
     {
diff --git a/spec/chef/monitoring/postgres_exporter_spec.rb b/spec/chef/monitoring/postgres_exporter_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvcG9zdGdyZXNfZXhwb3J0ZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvcG9zdGdyZXNfZXhwb3J0ZXJfc3BlYy5yYg== 100644
--- a/spec/chef/monitoring/postgres_exporter_spec.rb
+++ b/spec/chef/monitoring/postgres_exporter_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'monitoring::postgres-exporter' do
+RSpec.describe 'monitoring::postgres-exporter' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:node) { chef_run.node }
   let(:default_vars) do
diff --git a/spec/chef/monitoring/prometheus_spec.rb b/spec/chef/monitoring/prometheus_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvcHJvbWV0aGV1c19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvcHJvbWV0aGV1c19zcGVjLnJi 100644
--- a/spec/chef/monitoring/prometheus_spec.rb
+++ b/spec/chef/monitoring/prometheus_spec.rb
@@ -177,7 +177,7 @@
         - localhost:9093
 PROMYML
 
-describe 'monitoring::prometheus' do
+RSpec.describe 'monitoring::prometheus' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:default_vars) do
     {
diff --git a/spec/chef/monitoring/redis_exporter_spec.rb b/spec/chef/monitoring/redis_exporter_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL21vbml0b3JpbmcvcmVkaXNfZXhwb3J0ZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL21vbml0b3JpbmcvcmVkaXNfZXhwb3J0ZXJfc3BlYy5yYg== 100644
--- a/spec/chef/monitoring/redis_exporter_spec.rb
+++ b/spec/chef/monitoring/redis_exporter_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'monitoring::redis-exporter' do
+RSpec.describe 'monitoring::redis-exporter' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:node) { chef_run.node }
   let(:default_vars) do
diff --git a/spec/chef/package/recipes/runit_spec.rb b/spec/chef/package/recipes/runit_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVjaXBlcy9ydW5pdF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVjaXBlcy9ydW5pdF9zcGVjLnJi 100644
--- a/spec/chef/package/recipes/runit_spec.rb
+++ b/spec/chef/package/recipes/runit_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'package::runit' do
+RSpec.describe 'package::runit' do
   before do
     allow(Chef::Log).to receive(:info).and_call_original
     allow(Chef::Log).to receive(:warn).and_call_original
diff --git a/spec/chef/package/recipes/runit_systemd_spec.rb b/spec/chef/package/recipes/runit_systemd_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVjaXBlcy9ydW5pdF9zeXN0ZW1kX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVjaXBlcy9ydW5pdF9zeXN0ZW1kX3NwZWMucmI= 100644
--- a/spec/chef/package/recipes/runit_systemd_spec.rb
+++ b/spec/chef/package/recipes/runit_systemd_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'package::runit_systemd' do
+RSpec.describe 'package::runit_systemd' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::config', 'package::runit_systemd') }
 
   before do
diff --git a/spec/chef/package/resources/account_spec.rb b/spec/chef/package/resources/account_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL2FjY291bnRfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL2FjY291bnRfc3BlYy5yYg== 100644
--- a/spec/chef/package/resources/account_spec.rb
+++ b/spec/chef/package/resources/account_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'account' do
+RSpec.describe 'account' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(account))
   end
diff --git a/spec/chef/package/resources/env_dir_spec.rb b/spec/chef/package/resources/env_dir_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL2Vudl9kaXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL2Vudl9kaXJfc3BlYy5yYg== 100644
--- a/spec/chef/package/resources/env_dir_spec.rb
+++ b/spec/chef/package/resources/env_dir_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'env_dir' do
+RSpec.describe 'env_dir' do
   let(:runner) { ChefSpec::SoloRunner.new(step_into: %w(env_dir)) }
   let(:chef_run) { runner.converge("test_package::env_dir_create") }
 
diff --git a/spec/chef/package/resources/gitlab_sysctl_spec.rb b/spec/chef/package/resources/gitlab_sysctl_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL2dpdGxhYl9zeXNjdGxfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL2dpdGxhYl9zeXNjdGxfc3BlYy5yYg== 100644
--- a/spec/chef/package/resources/gitlab_sysctl_spec.rb
+++ b/spec/chef/package/resources/gitlab_sysctl_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'sysctl' do
+RSpec.describe 'sysctl' do
   let(:runner) { ChefSpec::SoloRunner.new(step_into: %w(gitlab_sysctl)) }
   let(:chef_run) { runner.converge("package::sysctl", "test_package::gitlab_sysctl_create") }
   let(:conf) { '90-omnibus-gitlab-foo.conf' }
diff --git a/spec/chef/package/resources/storage_directory_spec.rb b/spec/chef/package/resources/storage_directory_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL3N0b3JhZ2VfZGlyZWN0b3J5X3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL3N0b3JhZ2VfZGlyZWN0b3J5X3NwZWMucmI= 100644
--- a/spec/chef/package/resources/storage_directory_spec.rb
+++ b/spec/chef/package/resources/storage_directory_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'storage_directory' do
+RSpec.describe 'storage_directory' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(storage_directory)) do |node|
       node.normal['gitlab']['manage-storage-directories']['enable'] = true
diff --git a/spec/chef/package/resources/templatesymlink_spec.rb b/spec/chef/package/resources/templatesymlink_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL3RlbXBsYXRlc3ltbGlua19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL3RlbXBsYXRlc3ltbGlua19zcGVjLnJi 100644
--- a/spec/chef/package/resources/templatesymlink_spec.rb
+++ b/spec/chef/package/resources/templatesymlink_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'templatesymlink' do
+RSpec.describe 'templatesymlink' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(templatesymlink))
   end
diff --git a/spec/chef/package/resources/version_file_spec.rb b/spec/chef/package/resources/version_file_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL3ZlcnNpb25fZmlsZV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3BhY2thZ2UvcmVzb3VyY2VzL3ZlcnNpb25fZmlsZV9zcGVjLnJi 100644
--- a/spec/chef/package/resources/version_file_spec.rb
+++ b/spec/chef/package/resources/version_file_spec.rb
@@ -6,7 +6,7 @@
 # Collect version as the custom resource would
 version = VersionHelper.version(version_check_cmd)
 
-describe 'version_file' do
+RSpec.describe 'version_file' do
   let(:runner) { ChefSpec::SoloRunner.new(step_into: %w(version_file)) }
   let(:chef_run) { runner.converge("test_package::version_file_create") }
 
diff --git a/spec/chef/postgresql/resources/config_spec.rb b/spec/chef/postgresql/resources/config_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL2NvbmZpZ19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL2NvbmZpZ19zcGVjLnJi 100644
--- a/spec/chef/postgresql/resources/config_spec.rb
+++ b/spec/chef/postgresql/resources/config_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_config' do
+RSpec.describe 'postgresql_config' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(postgresql_config)) do |node|
       node.normal['postgresql']['data_dir'] = '/fakedir'
diff --git a/spec/chef/postgresql/resources/database_spec.rb b/spec/chef/postgresql/resources/database_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL2RhdGFiYXNlX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL2RhdGFiYXNlX3NwZWMucmI= 100644
--- a/spec/chef/postgresql/resources/database_spec.rb
+++ b/spec/chef/postgresql/resources/database_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_database' do
+RSpec.describe 'postgresql_database' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(postgresql_database)) do |node|
       # unix_socket_directory is normally conditionally set in postgresql::enable
diff --git a/spec/chef/postgresql/resources/extension_spec.rb b/spec/chef/postgresql/resources/extension_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL2V4dGVuc2lvbl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL2V4dGVuc2lvbl9zcGVjLnJi 100644
--- a/spec/chef/postgresql/resources/extension_spec.rb
+++ b/spec/chef/postgresql/resources/extension_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_query' do
+RSpec.describe 'postgresql_query' do
   let(:runner) { ChefSpec::SoloRunner.new(step_into: %w(postgresql_extension)) }
 
   context 'run' do
diff --git a/spec/chef/postgresql/resources/query_spec.rb b/spec/chef/postgresql/resources/query_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL3F1ZXJ5X3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL3F1ZXJ5X3NwZWMucmI= 100644
--- a/spec/chef/postgresql/resources/query_spec.rb
+++ b/spec/chef/postgresql/resources/query_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_query' do
+RSpec.describe 'postgresql_query' do
   let(:runner) { ChefSpec::SoloRunner.new(step_into: %w(postgresql_query)) }
 
   context 'run' do
diff --git a/spec/chef/postgresql/resources/schema_spec.rb b/spec/chef/postgresql/resources/schema_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL3NjaGVtYV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL3NjaGVtYV9zcGVjLnJi 100644
--- a/spec/chef/postgresql/resources/schema_spec.rb
+++ b/spec/chef/postgresql/resources/schema_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_schema' do
+RSpec.describe 'postgresql_schema' do
   let(:runner) { ChefSpec::SoloRunner.new(step_into: %w(postgresql_schema)) }
 
   context 'create' do
diff --git a/spec/chef/postgresql/resources/user_spec.rb b/spec/chef/postgresql/resources/user_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL3VzZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3Bvc3RncmVzcWwvcmVzb3VyY2VzL3VzZXJfc3BlYy5yYg== 100644
--- a/spec/chef/postgresql/resources/user_spec.rb
+++ b/spec/chef/postgresql/resources/user_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql_user' do
+RSpec.describe 'postgresql_user' do
   before do
     allow_any_instance_of(PgHelper).to receive(:is_offline_or_readonly?).and_return(false)
     allow_any_instance_of(PgHelper).to receive(:user_exists?).and_return(false, true)
diff --git a/spec/chef/recipes/add_trusted_certs_spec.rb b/spec/chef/recipes/add_trusted_certs_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvYWRkX3RydXN0ZWRfY2VydHNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvYWRkX3RydXN0ZWRfY2VydHNfc3BlYy5yYg== 100644
--- a/spec/chef/recipes/add_trusted_certs_spec.rb
+++ b/spec/chef/recipes/add_trusted_certs_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'add_trusted_certs recipe' do
+RSpec.describe 'add_trusted_certs recipe' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
   let(:cert_helper) { CertificateHelper.new('/etc/gitlab/trusted-certs', '/opt/gitlab/embedded/ssl/certs', '/var/opt/gitlab') }
 
diff --git a/spec/chef/recipes/config_spec.rb b/spec/chef/recipes/config_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvY29uZmlnX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvY29uZmlnX3NwZWMucmI= 100644
--- a/spec/chef/recipes/config_spec.rb
+++ b/spec/chef/recipes/config_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::config' do
+RSpec.describe 'gitlab::config' do
   cached(:chef_run) { converge_config }
   let(:node) { chef_run.node }
 
diff --git a/spec/chef/recipes/crond_enable_spec.rb b/spec/chef/recipes/crond_enable_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvY3JvbmRfZW5hYmxlX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvY3JvbmRfZW5hYmxlX3NwZWMucmI= 100644
--- a/spec/chef/recipes/crond_enable_spec.rb
+++ b/spec/chef/recipes/crond_enable_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'crond::enable' do
+RSpec.describe 'crond::enable' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('crond::enable') }
 
   it "should create a log directory" do
diff --git a/spec/chef/recipes/database_migrations_spec.rb b/spec/chef/recipes/database_migrations_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZGF0YWJhc2VfbWlncmF0aW9uc19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZGF0YWJhc2VfbWlncmF0aW9uc19zcGVjLnJi 100644
--- a/spec/chef/recipes/database_migrations_spec.rb
+++ b/spec/chef/recipes/database_migrations_spec.rb
@@ -6,7 +6,7 @@
 # to the bash block.
 #
 
-describe 'gitlab::database-migrations' do
+RSpec.describe 'gitlab::database-migrations' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/default_spec.rb b/spec/chef/recipes/default_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZGVmYXVsdF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZGVmYXVsdF9zcGVjLnJi 100644
--- a/spec/chef/recipes/default_spec.rb
+++ b/spec/chef/recipes/default_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::default' do
+RSpec.describe 'gitlab::default' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/gitaly_spec.rb b/spec/chef/recipes/gitaly_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0YWx5X3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0YWx5X3NwZWMucmI= 100644
--- a/spec/chef/recipes/gitaly_spec.rb
+++ b/spec/chef/recipes/gitaly_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitaly' do
+RSpec.describe 'gitaly' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:config_path) { '/var/opt/gitlab/gitaly/config.toml' }
   let(:gitaly_config) { chef_run.template(config_path) }
@@ -454,7 +454,7 @@
   end
 end
 
-describe 'gitaly::git_data_dirs' do
+RSpec.describe 'gitaly::git_data_dirs' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/gitlab-healthcheck_spec.rb b/spec/chef/recipes/gitlab-healthcheck_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWhlYWx0aGNoZWNrX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWhlYWx0aGNoZWNrX3NwZWMucmI= 100644
--- a/spec/chef/recipes/gitlab-healthcheck_spec.rb
+++ b/spec/chef/recipes/gitlab-healthcheck_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::gitlab-healthcheck' do
+RSpec.describe 'gitlab::gitlab-healthcheck' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/gitlab-pages_spec.rb b/spec/chef/recipes/gitlab-pages_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXBhZ2VzX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXBhZ2VzX3NwZWMucmI= 100644
--- a/spec/chef/recipes/gitlab-pages_spec.rb
+++ b/spec/chef/recipes/gitlab-pages_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::gitlab-pages' do
+RSpec.describe 'gitlab::gitlab-pages' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service env_dir)).converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/gitlab-rails_spec.rb b/spec/chef/recipes/gitlab-rails_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXJhaWxzX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXJhaWxzX3NwZWMucmI= 100644
--- a/spec/chef/recipes/gitlab-rails_spec.rb
+++ b/spec/chef/recipes/gitlab-rails_spec.rb
@@ -8,7 +8,7 @@
   end
 end
 
-describe 'gitlab::gitlab-rails' do
+RSpec.describe 'gitlab::gitlab-rails' do
   using RSpec::Parameterized::TableSyntax
 
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(templatesymlink runit_service)).converge('gitlab::default') }
diff --git a/spec/chef/recipes/gitlab-shell_spec.rb b/spec/chef/recipes/gitlab-shell_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXNoZWxsX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXNoZWxsX3NwZWMucmI= 100644
--- a/spec/chef/recipes/gitlab-shell_spec.rb
+++ b/spec/chef/recipes/gitlab-shell_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::gitlab-shell' do
+RSpec.describe 'gitlab::gitlab-shell' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/gitlab-workhorse_spec.rb b/spec/chef/recipes/gitlab-workhorse_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXdvcmtob3JzZV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXdvcmtob3JzZV9zcGVjLnJi 100644
--- a/spec/chef/recipes/gitlab-workhorse_spec.rb
+++ b/spec/chef/recipes/gitlab-workhorse_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::gitlab-workhorse' do
+RSpec.describe 'gitlab::gitlab-workhorse' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:default_vars) do
     {
diff --git a/spec/chef/recipes/letsencrypt_spec.rb b/spec/chef/recipes/letsencrypt_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvbGV0c2VuY3J5cHRfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvbGV0c2VuY3J5cHRfc3BlYy5yYg== 100644
--- a/spec/chef/recipes/letsencrypt_spec.rb
+++ b/spec/chef/recipes/letsencrypt_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'enabling letsencrypt' do
+RSpec.describe 'enabling letsencrypt' do
   before do
     allow(Gitlab).to receive(:[]).and_call_original
     stub_gitlab_rb(external_url: 'https://fakehost.example.com')
@@ -38,7 +38,7 @@
   end
 end
 
-describe 'letsencrypt::enable' do
+RSpec.describe 'letsencrypt::enable' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
   let(:node) { chef_run.node }
 
@@ -185,7 +185,7 @@
 end
 
 # This should work standalone for renewal purposes
-describe 'letsencrypt::renew' do
+RSpec.describe 'letsencrypt::renew' do
   let(:chef_run) do
     ChefSpec::SoloRunner.converge('gitlab::letsencrypt_renew')
   end
diff --git a/spec/chef/recipes/logrotate_folders_and_configs_spec.rb b/spec/chef/recipes/logrotate_folders_and_configs_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvbG9ncm90YXRlX2ZvbGRlcnNfYW5kX2NvbmZpZ3Nfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvbG9ncm90YXRlX2ZvbGRlcnNfYW5kX2NvbmZpZ3Nfc3BlYy5yYg== 100644
--- a/spec/chef/recipes/logrotate_folders_and_configs_spec.rb
+++ b/spec/chef/recipes/logrotate_folders_and_configs_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::logrotate_folder_and_configs_spec' do
+RSpec.describe 'gitlab::logrotate_folder_and_configs_spec' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/logrotate_spec.rb b/spec/chef/recipes/logrotate_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvbG9ncm90YXRlX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvbG9ncm90YXRlX3NwZWMucmI= 100644
--- a/spec/chef/recipes/logrotate_spec.rb
+++ b/spec/chef/recipes/logrotate_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::logrotate' do
+RSpec.describe 'gitlab::logrotate' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/mailroom_spec.rb b/spec/chef/recipes/mailroom_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvbWFpbHJvb21fc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvbWFpbHJvb21fc3BlYy5yYg== 100644
--- a/spec/chef/recipes/mailroom_spec.rb
+++ b/spec/chef/recipes/mailroom_spec.rb
@@ -16,7 +16,7 @@
 
 require 'chef_helper'
 
-describe 'gitlab::mailroom' do
+RSpec.describe 'gitlab::mailroom' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/mattermost_spec.rb b/spec/chef/recipes/mattermost_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvbWF0dGVybW9zdF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvbWF0dGVybW9zdF9zcGVjLnJi 100644
--- a/spec/chef/recipes/mattermost_spec.rb
+++ b/spec/chef/recipes/mattermost_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::mattermost' do
+RSpec.describe 'gitlab::mattermost' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:default_vars) do
     {
diff --git a/spec/chef/recipes/nginx_spec.rb b/spec/chef/recipes/nginx_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvbmdpbnhfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvbmdpbnhfc3BlYy5yYg== 100644
--- a/spec/chef/recipes/nginx_spec.rb
+++ b/spec/chef/recipes/nginx_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::nginx' do
+RSpec.describe 'gitlab::nginx' do
   let(:chef_runner) do
     ChefSpec::SoloRunner.new(step_into: %w(runit_service)) do |node|
       node.normal['gitlab']['nginx']['enable'] = true
@@ -68,7 +68,7 @@
   end
 end
 
-describe 'nginx' do
+RSpec.describe 'nginx' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   subject { chef_run }
 
diff --git a/spec/chef/recipes/postgresql_spec.rb b/spec/chef/recipes/postgresql_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvcG9zdGdyZXNxbF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvcG9zdGdyZXNxbF9zcGVjLnJi 100644
--- a/spec/chef/recipes/postgresql_spec.rb
+++ b/spec/chef/recipes/postgresql_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'postgresql 9.2' do
+RSpec.describe 'postgresql 9.2' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service postgresql_config)).converge('gitlab::default') }
   let(:postgresql_data_dir) { '/var/opt/gitlab/postgresql/data' }
   let(:postgresql_ssl_cert) { File.join(postgresql_data_dir, 'server.crt') }
@@ -319,7 +319,7 @@
   end
 end
 
-describe 'postgresql 9.6' do
+RSpec.describe 'postgresql 9.6' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service postgresql_config database_objects)).converge('gitlab::default') }
   let(:postgresql_conf) { '/var/opt/gitlab/postgresql/data/postgresql.conf' }
   let(:runtime_conf) { '/var/opt/gitlab/postgresql/data/runtime.conf' }
@@ -795,7 +795,7 @@
   end
 end
 
-describe 'postgresql::bin' do
+RSpec.describe 'postgresql::bin' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
@@ -885,7 +885,7 @@
   end
 end
 
-describe 'postgresql dir and homedir' do
+RSpec.describe 'postgresql dir and homedir' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service postgresql_config)).converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/praefect_spec.rb b/spec/chef/recipes/praefect_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvcHJhZWZlY3Rfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvcHJhZWZlY3Rfc3BlYy5yYg== 100644
--- a/spec/chef/recipes/praefect_spec.rb
+++ b/spec/chef/recipes/praefect_spec.rb
@@ -1,5 +1,5 @@
 require 'chef_helper'
-describe 'praefect' do
+RSpec.describe 'praefect' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service env_dir)).converge('gitlab::default') }
   let(:prometheus_grpc_latency_buckets) do
     '[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]'
diff --git a/spec/chef/recipes/puma_spec.rb b/spec/chef/recipes/puma_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvcHVtYV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvcHVtYV9zcGVjLnJi 100644
--- a/spec/chef/recipes/puma_spec.rb
+++ b/spec/chef/recipes/puma_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::puma with Ubuntu 16.04' do
+RSpec.describe 'gitlab::puma with Ubuntu 16.04' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(runit_service),
@@ -191,7 +191,7 @@
   end
 end
 
-describe 'gitlab::puma Ubuntu 16.04 with no tmpfs' do
+RSpec.describe 'gitlab::puma Ubuntu 16.04 with no tmpfs' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       path: 'spec/fixtures/fauxhai/ubuntu/16.04-no-run-tmpfs.json',
@@ -218,7 +218,7 @@
   end
 end
 
-describe 'gitlab::puma Ubuntu 16.04 Docker' do
+RSpec.describe 'gitlab::puma Ubuntu 16.04 Docker' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       path: 'spec/fixtures/fauxhai/ubuntu/16.04-docker.json',
@@ -252,7 +252,7 @@
   end
 end
 
-describe 'gitlab::puma with more CPUs' do
+RSpec.describe 'gitlab::puma with more CPUs' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(runit_service),
diff --git a/spec/chef/recipes/rails_cache_clear_spec.rb b/spec/chef/recipes/rails_cache_clear_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvcmFpbHNfY2FjaGVfY2xlYXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvcmFpbHNfY2FjaGVfY2xlYXJfc3BlYy5yYg== 100644
--- a/spec/chef/recipes/rails_cache_clear_spec.rb
+++ b/spec/chef/recipes/rails_cache_clear_spec.rb
@@ -5,7 +5,7 @@
 # We just test if we use proper command and that we can change default
 # attribute value with gilab.rb setting.
 
-describe 'gitlab::rails-cache-clear' do
+RSpec.describe 'gitlab::rails-cache-clear' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/registry_spec.rb b/spec/chef/recipes/registry_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvcmVnaXN0cnlfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvcmVnaXN0cnlfc3BlYy5yYg== 100755
--- a/spec/chef/recipes/registry_spec.rb
+++ b/spec/chef/recipes/registry_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'registry recipe' do
+RSpec.describe 'registry recipe' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
 
   before do
@@ -177,7 +177,7 @@
   end
 end
 
-describe 'registry' do
+RSpec.describe 'registry' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:default_vars) do
     {
@@ -447,7 +447,7 @@
   end
 end
 
-describe 'auto enabling registry' do
+RSpec.describe 'auto enabling registry' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   let(:registry_config) { '/var/opt/gitlab/registry/config.yml' }
   let(:nginx_config) { '/var/opt/gitlab/nginx/conf/gitlab-registry.conf' }
diff --git a/spec/chef/recipes/remote-syslog_spec.rb b/spec/chef/recipes/remote-syslog_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvcmVtb3RlLXN5c2xvZ19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvcmVtb3RlLXN5c2xvZ19zcGVjLnJi 100644
--- a/spec/chef/recipes/remote-syslog_spec.rb
+++ b/spec/chef/recipes/remote-syslog_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::remote-syslog' do
+RSpec.describe 'gitlab::remote-syslog' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
   before do
     allow(Gitlab).to receive(:[]).and_call_original
diff --git a/spec/chef/recipes/selinux_spec.rb b/spec/chef/recipes/selinux_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvc2VsaW51eF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvc2VsaW51eF9zcGVjLnJi 100644
--- a/spec/chef/recipes/selinux_spec.rb
+++ b/spec/chef/recipes/selinux_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::gitlab-selinux' do
+RSpec.describe 'gitlab::gitlab-selinux' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(templatesymlink storage_directory)).converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/sidekiq-cluster_spec.rb b/spec/chef/recipes/sidekiq-cluster_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvc2lkZWtpcS1jbHVzdGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvc2lkZWtpcS1jbHVzdGVyX3NwZWMucmI= 100644
--- a/spec/chef/recipes/sidekiq-cluster_spec.rb
+++ b/spec/chef/recipes/sidekiq-cluster_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::sidekiq-cluster' do
+RSpec.describe 'gitlab::sidekiq-cluster' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(sidekiq_service runit_service),
diff --git a/spec/chef/recipes/sidekiq_spec.rb b/spec/chef/recipes/sidekiq_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvc2lkZWtpcV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvc2lkZWtpcV9zcGVjLnJi 100644
--- a/spec/chef/recipes/sidekiq_spec.rb
+++ b/spec/chef/recipes/sidekiq_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::sidekiq' do
+RSpec.describe 'gitlab::sidekiq' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(sidekiq_service runit_service),
diff --git a/spec/chef/recipes/storage-check_spec.rb b/spec/chef/recipes/storage-check_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvc3RvcmFnZS1jaGVja19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvc3RvcmFnZS1jaGVja19zcGVjLnJi 100644
--- a/spec/chef/recipes/storage-check_spec.rb
+++ b/spec/chef/recipes/storage-check_spec.rb
@@ -16,7 +16,7 @@
 
 require 'chef_helper'
 
-describe 'gitlab::storage-check' do
+RSpec.describe 'gitlab::storage-check' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service)).converge('gitlab::default') }
 
   before do
diff --git a/spec/chef/recipes/unicorn_spec.rb b/spec/chef/recipes/unicorn_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvdW5pY29ybl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvdW5pY29ybl9zcGVjLnJi 100644
--- a/spec/chef/recipes/unicorn_spec.rb
+++ b/spec/chef/recipes/unicorn_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::unicorn' do
+RSpec.describe 'gitlab::unicorn' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(unicorn_service unicorn_config runit_service),
@@ -98,7 +98,7 @@
   end
 end
 
-describe 'gitlab::unicorn' do
+RSpec.describe 'gitlab::unicorn' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(unicorn_service unicorn_config runit_service),
@@ -128,7 +128,7 @@
   end
 end
 
-describe 'gitlab::unicorn' do
+RSpec.describe 'gitlab::unicorn' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(unicorn_service unicorn_config runit_service),
@@ -158,7 +158,7 @@
   end
 end
 
-describe 'gitlab::unicorn' do
+RSpec.describe 'gitlab::unicorn' do
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(
       step_into: %w(unicorn_service unicorn_config runit_service),
diff --git a/spec/chef/recipes/users_spec.rb b/spec/chef/recipes/users_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlY2lwZXMvdXNlcnNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlY2lwZXMvdXNlcnNfc3BlYy5yYg== 100644
--- a/spec/chef/recipes/users_spec.rb
+++ b/spec/chef/recipes/users_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'gitlab::users' do
+RSpec.describe 'gitlab::users' do
   let(:chef_run) { ChefSpec::SoloRunner.new.converge('gitlab::users') }
 
   before do
diff --git a/spec/chef/redis/redis_spec.rb b/spec/chef/redis/redis_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3JlZGlzL3JlZGlzX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3JlZGlzL3JlZGlzX3NwZWMucmI= 100644
--- a/spec/chef/redis/redis_spec.rb
+++ b/spec/chef/redis/redis_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'redis' do
+RSpec.describe 'redis' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(redis_service runit_service)).converge('gitlab::default') }
   let(:redis_conf) { '/var/opt/gitlab/redis/redis.conf' }
 
diff --git a/spec/chef/resources/puma_config_spec.rb b/spec/chef/resources/puma_config_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3Jlc291cmNlcy9wdW1hX2NvbmZpZ19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3Jlc291cmNlcy9wdW1hX2NvbmZpZ19zcGVjLnJi 100644
--- a/spec/chef/resources/puma_config_spec.rb
+++ b/spec/chef/resources/puma_config_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'puma_config' do
+RSpec.describe 'puma_config' do
   let(:runner) do
     ChefSpec::SoloRunner.new(step_into: %w(puma_config))
   end
diff --git a/spec/chef/secrets_spec.rb b/spec/chef/secrets_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9jaGVmL3NlY3JldHNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9jaGVmL3NlY3JldHNfc3BlYy5yYg== 100644
--- a/spec/chef/secrets_spec.rb
+++ b/spec/chef/secrets_spec.rb
@@ -1,7 +1,7 @@
 require 'chef_helper'
 require 'base64'
 
-describe 'secrets' do
+RSpec.describe 'secrets' do
   let(:chef_run) { ChefSpec::SoloRunner.new.converge('gitlab::default') }
 
   HEX_KEY = /\h{128}/.freeze
diff --git a/spec/gitlab-ctl-commands-ee/geo_replication_spec.rb b/spec/gitlab-ctl-commands-ee/geo_replication_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2dlb19yZXBsaWNhdGlvbl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2dlb19yZXBsaWNhdGlvbl9zcGVjLnJi 100644
--- a/spec/gitlab-ctl-commands-ee/geo_replication_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/geo_replication_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'omnibus-ctl'
 
-describe 'gitlab-ctl geo-replication' do
+RSpec.describe 'gitlab-ctl geo-replication' do
   let(:toggle_command) { double(Geo::ReplicationToggleCommand) }
 
   subject { Omnibus::Ctl.new('testing-ctl') }
diff --git a/spec/gitlab-ctl-commands-ee/lib/consul_spec.rb b/spec/gitlab-ctl-commands-ee/lib/consul_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9jb25zdWxfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9jb25zdWxfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands-ee/lib/consul_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/consul_spec.rb
@@ -4,7 +4,7 @@
 
 require 'consul'
 
-describe ConsulHandler do
+RSpec.describe ConsulHandler do
   describe '#initialize' do
     it 'creates instance based on args' do
       instance = ConsulHandler.new([nil, nil, 'consul', 'kv', 'set'], 'rspec')
@@ -24,7 +24,7 @@
   end
 end
 
-describe ConsulHandler::Kv do
+RSpec.describe ConsulHandler::Kv do
   let(:consul_cmd) { '/opt/gitlab/embedded/bin/consul' }
 
   it 'allows nil values' do
diff --git a/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_node_spec.rb b/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_node_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcHJvbW90ZV90b19wcmltYXJ5X25vZGVfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcHJvbW90ZV90b19wcmltYXJ5X25vZGVfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_node_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_node_spec.rb
@@ -4,7 +4,7 @@
 require 'geo/promotion_preflight_checks'
 require 'gitlab_ctl/util'
 
-describe Geo::PromoteToPrimaryNode, '#execute' do
+RSpec.describe Geo::PromoteToPrimaryNode, '#execute' do
   let(:options) { { skip_preflight_checks: true } }
 
   subject(:command) { described_class.new(nil, options) }
diff --git a/spec/gitlab-ctl-commands-ee/lib/geo/promotion_preflight_checks_spec.rb b/spec/gitlab-ctl-commands-ee/lib/geo/promotion_preflight_checks_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcHJvbW90aW9uX3ByZWZsaWdodF9jaGVja3Nfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcHJvbW90aW9uX3ByZWZsaWdodF9jaGVja3Nfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands-ee/lib/geo/promotion_preflight_checks_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/geo/promotion_preflight_checks_spec.rb
@@ -2,7 +2,7 @@
 require 'geo/promotion_preflight_checks'
 require 'gitlab_ctl/util'
 
-describe Geo::PromotionPreflightChecks, '#execute' do
+RSpec.describe Geo::PromotionPreflightChecks, '#execute' do
   let(:confirmation) { 'y' }
   let(:options) { { confirm_primary_is_down: true } }
 
diff --git a/spec/gitlab-ctl-commands-ee/lib/geo/replication_process_spec.rb b/spec/gitlab-ctl-commands-ee/lib/geo/replication_process_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcmVwbGljYXRpb25fcHJvY2Vzc19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcmVwbGljYXRpb25fcHJvY2Vzc19zcGVjLnJi 100644
--- a/spec/gitlab-ctl-commands-ee/lib/geo/replication_process_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/geo/replication_process_spec.rb
@@ -6,7 +6,7 @@
 require 'geo/replication_process'
 require 'gitlab_ctl/util'
 
-describe Geo::ReplicationProcess do
+RSpec.describe Geo::ReplicationProcess do
   let(:error_text) { 'AN ERROR' }
   let(:good_status) { double('Command status', error?: false) }
   let(:bad_status) { double('Command status', error?: true, stdout: error_text) }
diff --git a/spec/gitlab-ctl-commands-ee/lib/geo/replication_spec.rb b/spec/gitlab-ctl-commands-ee/lib/geo/replication_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcmVwbGljYXRpb25fc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcmVwbGljYXRpb25fc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands-ee/lib/geo/replication_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/geo/replication_spec.rb
@@ -6,7 +6,7 @@
 require 'geo/replication'
 require 'gitlab_ctl/util'
 
-describe Geo::Replication, '#execute' do
+RSpec.describe Geo::Replication, '#execute' do
   let(:command) { spy('command spy', error?: false) }
   let(:instance) { double(base_path: '/opt/gitlab/embedded', data_path: '/var/opt/gitlab/postgresql/data') }
   let(:file) { spy('file spy') }
diff --git a/spec/gitlab-ctl-commands-ee/lib/geo/replication_toggle_command_spec.rb b/spec/gitlab-ctl-commands-ee/lib/geo/replication_toggle_command_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcmVwbGljYXRpb25fdG9nZ2xlX2NvbW1hbmRfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcmVwbGljYXRpb25fdG9nZ2xlX2NvbW1hbmRfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands-ee/lib/geo/replication_toggle_command_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/geo/replication_toggle_command_spec.rb
@@ -5,7 +5,7 @@
 
 require 'geo/replication_toggle_command'
 
-describe Geo::ReplicationToggleCommand do
+RSpec.describe Geo::ReplicationToggleCommand do
   let(:status) { double('Command status', error?: false) }
   let(:arguments) { [] }
   let(:ctl_instance) { double('gitlab-ctl instance', base_path: '') }
diff --git a/spec/gitlab-ctl-commands-ee/lib/patroni_spec.rb b/spec/gitlab-ctl-commands-ee/lib/patroni_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9wYXRyb25pX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9wYXRyb25pX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands-ee/lib/patroni_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/patroni_spec.rb
@@ -5,7 +5,7 @@
 require_relative('../../../files/gitlab-ctl-commands/lib/gitlab_ctl')
 require_relative('../../../files/gitlab-ctl-commands-ee/lib/patroni')
 
-describe 'Patroni' do
+RSpec.describe 'Patroni' do
   core_commands = %w(bootstrap check-leader check-replica)
   additional_commands = %w(members pause resume failover switchover)
   all_commands = core_commands + additional_commands
diff --git a/spec/gitlab-ctl-commands-ee/lib/pgbouncer_spec.rb b/spec/gitlab-ctl-commands-ee/lib/pgbouncer_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9wZ2JvdW5jZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9wZ2JvdW5jZXJfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands-ee/lib/pgbouncer_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/pgbouncer_spec.rb
@@ -4,7 +4,7 @@
 
 require 'pgbouncer'
 
-describe Pgbouncer::Databases do
+RSpec.describe Pgbouncer::Databases do
   let(:fake_ohai) do
     {
       'gitlab' => {
diff --git a/spec/gitlab-ctl-commands-ee/lib/postgresql/ee_spec.rb b/spec/gitlab-ctl-commands-ee/lib/postgresql/ee_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9wb3N0Z3Jlc3FsL2VlX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9wb3N0Z3Jlc3FsL2VlX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands-ee/lib/postgresql/ee_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/postgresql/ee_spec.rb
@@ -6,7 +6,7 @@
 require 'gitlab_ctl/util'
 require 'postgresql/ee'
 
-describe GitlabCtl::PostgreSQL::EE do
+RSpec.describe GitlabCtl::PostgreSQL::EE do
   describe "#get_primary" do
     context 'when Consul disabled' do
       before do
diff --git a/spec/gitlab-ctl-commands-ee/lib/repmgr_helper_spec.rb b/spec/gitlab-ctl-commands-ee/lib/repmgr_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9yZXBtZ3JfaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9yZXBtZ3JfaGVscGVyX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands-ee/lib/repmgr_helper_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/lib/repmgr_helper_spec.rb
@@ -4,7 +4,7 @@
 
 require 'repmgr'
 
-describe RepmgrHandler do
+RSpec.describe RepmgrHandler do
   let(:repmgr_base_cmd) { '/opt/gitlab/embedded/bin/repmgr  -f /var/opt/gitlab/postgresql/repmgr.conf' }
   let(:public_attributes) { { 'postgresql' => { 'dir' => '/var/opt/gitlab/postgresql' } } }
   let(:shellout) do
diff --git a/spec/gitlab-ctl-commands-ee/promote_to_primary_node_spec.rb b/spec/gitlab-ctl-commands-ee/promote_to_primary_node_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL3Byb21vdGVfdG9fcHJpbWFyeV9ub2RlX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL3Byb21vdGVfdG9fcHJpbWFyeV9ub2RlX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands-ee/promote_to_primary_node_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/promote_to_primary_node_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'geo/promote_to_primary_node'
 
-describe 'gitlab-ctl promote-to-primary-node' do
+RSpec.describe 'gitlab-ctl promote-to-primary-node' do
   let(:klass) { Geo::PromoteToPrimaryNode }
   let(:command_name) { 'promote-to-primary-node' }
   let(:command_script) { 'promote_to_primary_node' }
diff --git a/spec/gitlab-ctl-commands-ee/promotion_preflight_checks_spec.rb b/spec/gitlab-ctl-commands-ee/promotion_preflight_checks_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL3Byb21vdGlvbl9wcmVmbGlnaHRfY2hlY2tzX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL3Byb21vdGlvbl9wcmVmbGlnaHRfY2hlY2tzX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands-ee/promotion_preflight_checks_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/promotion_preflight_checks_spec.rb
@@ -7,7 +7,7 @@
   let(:command_script) { 'promotion_preflight_checks' }
 end
 
-describe 'gitlab-ctl promotion-preflight-checks' do
+RSpec.describe 'gitlab-ctl promotion-preflight-checks' do
   include_context 'promotion-preflight-checks'
   include_context 'ctl'
 
diff --git a/spec/gitlab-ctl-commands-ee/replicate_geo_database_spec.rb b/spec/gitlab-ctl-commands-ee/replicate_geo_database_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL3JlcGxpY2F0ZV9nZW9fZGF0YWJhc2Vfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL3JlcGxpY2F0ZV9nZW9fZGF0YWJhc2Vfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands-ee/replicate_geo_database_spec.rb
+++ b/spec/gitlab-ctl-commands-ee/replicate_geo_database_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'omnibus-ctl'
 
-describe 'gitlab-ctl replicate-geo-database' do
+RSpec.describe 'gitlab-ctl replicate-geo-database' do
   subject { Omnibus::Ctl.new('testing-ctl') }
 
   let(:required_arguments) do
diff --git a/spec/gitlab-ctl-commands/gitlab_ctl_spec.rb b/spec/gitlab-ctl-commands/gitlab_ctl_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2dpdGxhYl9jdGxfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2dpdGxhYl9jdGxfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands/gitlab_ctl_spec.rb
+++ b/spec/gitlab-ctl-commands/gitlab_ctl_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'omnibus-ctl'
 
-describe 'gitlab-ctl' do
+RSpec.describe 'gitlab-ctl' do
   before do
     allow_any_instance_of(Omnibus::Ctl).to receive(:require).and_call_original
     allow_any_instance_of(Omnibus::Ctl).to receive(:require).with(
diff --git a/spec/gitlab-ctl-commands/lib/gitlab_ctl_backup_spec.rb b/spec/gitlab-ctl-commands/lib/gitlab_ctl_backup_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9naXRsYWJfY3RsX2JhY2t1cF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9naXRsYWJfY3RsX2JhY2t1cF9zcGVjLnJi 100644
--- a/spec/gitlab-ctl-commands/lib/gitlab_ctl_backup_spec.rb
+++ b/spec/gitlab-ctl-commands/lib/gitlab_ctl_backup_spec.rb
@@ -4,7 +4,7 @@
 
 require 'gitlab_ctl'
 
-describe GitlabCtl::Backup do
+RSpec.describe GitlabCtl::Backup do
   let(:backup_dir_path) { '/etc/gitlab/config_backup' }
 
   before do
diff --git a/spec/gitlab-ctl-commands/lib/gitlab_ctl_pg_upgrade_spec.rb b/spec/gitlab-ctl-commands/lib/gitlab_ctl_pg_upgrade_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9naXRsYWJfY3RsX3BnX3VwZ3JhZGVfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9naXRsYWJfY3RsX3BnX3VwZ3JhZGVfc3BlYy5yYg== 100644
--- a/spec/gitlab-ctl-commands/lib/gitlab_ctl_pg_upgrade_spec.rb
+++ b/spec/gitlab-ctl-commands/lib/gitlab_ctl_pg_upgrade_spec.rb
@@ -4,7 +4,7 @@
 
 require 'gitlab_ctl'
 
-describe GitlabCtl::PgUpgrade do
+RSpec.describe GitlabCtl::PgUpgrade do
   before do
     @fake_default_dir = '/fake/data/postgresql/data'
     allow(GitlabCtl::Util).to receive(:get_command_output).with(
diff --git a/spec/gitlab-ctl-commands/lib/postgresql/replication_spec.rb b/spec/gitlab-ctl-commands/lib/postgresql/replication_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9wb3N0Z3Jlc3FsL3JlcGxpY2F0aW9uX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9wb3N0Z3Jlc3FsL3JlcGxpY2F0aW9uX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands/lib/postgresql/replication_spec.rb
+++ b/spec/gitlab-ctl-commands/lib/postgresql/replication_spec.rb
@@ -3,7 +3,7 @@
 
 require 'postgresql/replication'
 
-describe PostgreSQL::Replication do
+RSpec.describe PostgreSQL::Replication do
   let(:ctl) { spy('gitlab ctl') }
   let(:util) { spy('gitlab ctl util', error?: false) }
   let(:attributes) { spy('node attributes spy') }
diff --git a/spec/gitlab-ctl-commands/lib/postgresql_spec.rb b/spec/gitlab-ctl-commands/lib/postgresql_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9wb3N0Z3Jlc3FsX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi9wb3N0Z3Jlc3FsX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands/lib/postgresql_spec.rb
+++ b/spec/gitlab-ctl-commands/lib/postgresql_spec.rb
@@ -4,7 +4,7 @@
 
 require 'postgresql'
 
-describe GitlabCtl::PostgreSQL do
+RSpec.describe GitlabCtl::PostgreSQL do
   describe "#postgresql_usernamename" do
     context 'when using legacy configuration' do
       before do
diff --git a/spec/gitlab-ctl-commands/lib/util_spec.rb b/spec/gitlab-ctl-commands/lib/util_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi91dGlsX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzL2xpYi91dGlsX3NwZWMucmI= 100644
--- a/spec/gitlab-ctl-commands/lib/util_spec.rb
+++ b/spec/gitlab-ctl-commands/lib/util_spec.rb
@@ -4,7 +4,7 @@
 
 require 'gitlab_ctl'
 
-describe GitlabCtl::Util do
+RSpec.describe GitlabCtl::Util do
   context 'when there is no TTY available' do
     before do
       allow(STDIN).to receive(:tty?).and_return(false)
diff --git a/spec/gitlab/build/check_spec.rb b/spec/gitlab/build/check_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvY2hlY2tfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvY2hlY2tfc3BlYy5yYg== 100644
--- a/spec/gitlab/build/check_spec.rb
+++ b/spec/gitlab/build/check_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build/check'
 
-describe Build::Check do
+RSpec.describe Build::Check do
   before do
     allow(ENV).to receive(:[]).and_call_original
   end
diff --git a/spec/gitlab/build/gitlab_image_spec.rb b/spec/gitlab/build/gitlab_image_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvZ2l0bGFiX2ltYWdlX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvZ2l0bGFiX2ltYWdlX3NwZWMucmI= 100644
--- a/spec/gitlab/build/gitlab_image_spec.rb
+++ b/spec/gitlab/build/gitlab_image_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build/gitlab_image'
 
-describe Build::GitlabImage do
+RSpec.describe Build::GitlabImage do
   before do
     allow(Build::Info).to receive(:package).and_return('gitlab-ce')
   end
diff --git a/spec/gitlab/build/ha_validate/nightly_spec.rb b/spec/gitlab/build/ha_validate/nightly_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvaGFfdmFsaWRhdGUvbmlnaHRseV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvaGFfdmFsaWRhdGUvbmlnaHRseV9zcGVjLnJi 100644
--- a/spec/gitlab/build/ha_validate/nightly_spec.rb
+++ b/spec/gitlab/build/ha_validate/nightly_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build/ha_validate/nightly'
 
-describe Build::HA::ValidateNightly do
+RSpec.describe Build::HA::ValidateNightly do
   let(:expected_url) { 'https://omnibus-builds.s3.amazonaws.com/ubuntu-xenial/gitlab-ee_99.9.9%2Brfbranch-55_amd64.deb' }
 
   before do
diff --git a/spec/gitlab/build/ha_validate/trigger_spec.rb b/spec/gitlab/build/ha_validate/trigger_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvaGFfdmFsaWRhdGUvdHJpZ2dlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvaGFfdmFsaWRhdGUvdHJpZ2dlcl9zcGVjLnJi 100644
--- a/spec/gitlab/build/ha_validate/trigger_spec.rb
+++ b/spec/gitlab/build/ha_validate/trigger_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build/ha_validate/trigger'
 
-describe Build::HA::ValidateTrigger do
+RSpec.describe Build::HA::ValidateTrigger do
   before do
     allow(ENV).to receive(:[]).and_call_original
     allow(ENV).to receive(:[]).with('CI_COMMIT_SHA').and_return('11111111111111111')
diff --git a/spec/gitlab/build/image_spec.rb b/spec/gitlab/build/image_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvaW1hZ2Vfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvaW1hZ2Vfc3BlYy5yYg== 100644
--- a/spec/gitlab/build/image_spec.rb
+++ b/spec/gitlab/build/image_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build/image'
 
-describe Build::Image do
+RSpec.describe Build::Image do
   ComponentImage = Class.new do
     extend Build::Image
 
diff --git a/spec/gitlab/build/info_spec.rb b/spec/gitlab/build/info_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvaW5mb19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvaW5mb19zcGVjLnJi 100644
--- a/spec/gitlab/build/info_spec.rb
+++ b/spec/gitlab/build/info_spec.rb
@@ -2,7 +2,7 @@
 require 'gitlab/build/info'
 require 'gitlab/build/gitlab_image'
 
-describe Build::Info do
+RSpec.describe Build::Info do
   before do
     allow(ENV).to receive(:[]).and_call_original
   end
diff --git a/spec/gitlab/build/metrics_spec.rb b/spec/gitlab/build/metrics_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvbWV0cmljc19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvbWV0cmljc19zcGVjLnJi 100644
--- a/spec/gitlab/build/metrics_spec.rb
+++ b/spec/gitlab/build/metrics_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../../lib/gitlab/build/metrics'
 require 'chef_helper'
 
-describe Build::Metrics do
+RSpec.describe Build::Metrics do
   before do
     allow_any_instance_of(Kernel).to receive(:system).and_return(true)
     allow(Build::Info).to receive(:package_download_url).and_return("https://example.com")
diff --git a/spec/gitlab/build/qa_image_spec.rb b/spec/gitlab/build/qa_image_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvcWFfaW1hZ2Vfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvcWFfaW1hZ2Vfc3BlYy5yYg== 100644
--- a/spec/gitlab/build/qa_image_spec.rb
+++ b/spec/gitlab/build/qa_image_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build/qa_image'
 
-describe Build::QAImage do
+RSpec.describe Build::QAImage do
   before do
     allow(Build::GitlabImage).to receive(:dockerhub_image_name).and_return('gitlab/gitlab-ce')
     allow(Build::GitlabImage).to receive(:gitlab_registry_image_name).and_return('gitlab-ce')
diff --git a/spec/gitlab/build/qa_spec.rb b/spec/gitlab/build/qa_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGQvcWFfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGQvcWFfc3BlYy5yYg== 100644
--- a/spec/gitlab/build/qa_spec.rb
+++ b/spec/gitlab/build/qa_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build/qa'
 
-describe Build::QA do
+RSpec.describe Build::QA do
   describe '.repo_path' do
     it 'returns correct location' do
       expect(described_class.repo_path).to eq("/tmp/gitlab")
diff --git a/spec/gitlab/build_iteration_spec.rb b/spec/gitlab/build_iteration_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGRfaXRlcmF0aW9uX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGRfaXRlcmF0aW9uX3NwZWMucmI= 100644
--- a/spec/gitlab/build_iteration_spec.rb
+++ b/spec/gitlab/build_iteration_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build_iteration'
 
-describe Gitlab::BuildIteration do
+RSpec.describe Gitlab::BuildIteration do
   describe :build_iteration do
     subject { Gitlab::BuildIteration.new(git_describe) }
 
diff --git a/spec/gitlab/build_spec.rb b/spec/gitlab/build_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvYnVpbGRfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvYnVpbGRfc3BlYy5yYg== 100644
--- a/spec/gitlab/build_spec.rb
+++ b/spec/gitlab/build_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/build'
 
-describe Build do
+RSpec.describe Build do
   describe 'cmd' do
     describe 'by default' do
       it 'runs build command with log level info' do
diff --git a/spec/gitlab/deployer_helper_spec.rb b/spec/gitlab/deployer_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvZGVwbG95ZXJfaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvZGVwbG95ZXJfaGVscGVyX3NwZWMucmI= 100644
--- a/spec/gitlab/deployer_helper_spec.rb
+++ b/spec/gitlab/deployer_helper_spec.rb
@@ -2,7 +2,7 @@
 require 'gitlab/build'
 require 'gitlab/deployer_helper'
 
-describe DeployerHelper do
+RSpec.describe DeployerHelper do
   subject(:service) { described_class.new('some-token', 'some-env', 'some-branch') }
   describe '#trigger_deploy' do
     it 'triggers an auto deploy' do
diff --git a/spec/gitlab/docker_image_memory_measurer_spec.rb b/spec/gitlab/docker_image_memory_measurer_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvZG9ja2VyX2ltYWdlX21lbW9yeV9tZWFzdXJlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvZG9ja2VyX2ltYWdlX21lbW9yeV9tZWFzdXJlcl9zcGVjLnJi 100644
--- a/spec/gitlab/docker_image_memory_measurer_spec.rb
+++ b/spec/gitlab/docker_image_memory_measurer_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/docker_image_memory_measurer'
 
-describe Gitlab::DockerImageMemoryMeasurer do
+RSpec.describe Gitlab::DockerImageMemoryMeasurer do
   let(:image_reference) { 'mocked_image_reference' }
   let(:measurer) { described_class.new(image_reference, debug_output_dir) }
   let(:delete_debug_output_dir) { FileUtils.remove_dir(debug_output_dir, true) }
diff --git a/spec/gitlab/docker_operations_spec.rb b/spec/gitlab/docker_operations_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvZG9ja2VyX29wZXJhdGlvbnNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvZG9ja2VyX29wZXJhdGlvbnNfc3BlYy5yYg== 100644
--- a/spec/gitlab/docker_operations_spec.rb
+++ b/spec/gitlab/docker_operations_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/docker_operations'
 
-describe DockerOperations do
+RSpec.describe DockerOperations do
   describe '.set_timeout' do
     context 'when ENV["DOCKER_TIMEOUT"] is not set' do
       it 'uses a default timeout value' do
diff --git a/spec/gitlab/package_repository_spec.rb b/spec/gitlab/package_repository_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvcGFja2FnZV9yZXBvc2l0b3J5X3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvcGFja2FnZV9yZXBvc2l0b3J5X3NwZWMucmI= 100644
--- a/spec/gitlab/package_repository_spec.rb
+++ b/spec/gitlab/package_repository_spec.rb
@@ -2,7 +2,7 @@
 require 'gitlab/package_repository'
 require 'gitlab/util'
 
-describe PackageRepository do
+RSpec.describe PackageRepository do
   let(:repo) { PackageRepository.new }
 
   before do
diff --git a/spec/gitlab/tasks/aws_spec.rb b/spec/gitlab/tasks/aws_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvdGFza3MvYXdzX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvdGFza3MvYXdzX3NwZWMucmI= 100644
--- a/spec/gitlab/tasks/aws_spec.rb
+++ b/spec/gitlab/tasks/aws_spec.rb
@@ -32,7 +32,7 @@
   end
 end
 
-describe 'aws:process', type: :rake do
+RSpec.describe 'aws:process', type: :rake do
   before :all do
     Rake.application.rake_require 'gitlab/tasks/aws'
   end
diff --git a/spec/gitlab/tasks/docker_tasks_spec.rb b/spec/gitlab/tasks/docker_tasks_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvdGFza3MvZG9ja2VyX3Rhc2tzX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvdGFza3MvZG9ja2VyX3Rhc2tzX3NwZWMucmI= 100644
--- a/spec/gitlab/tasks/docker_tasks_spec.rb
+++ b/spec/gitlab/tasks/docker_tasks_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative '../../../lib/gitlab/docker_operations.rb'
 
-describe 'docker', type: :rake do
+RSpec.describe 'docker', type: :rake do
   before :all do
     Rake.application.rake_require 'gitlab/tasks/docker_tasks'
   end
@@ -127,7 +127,7 @@
   end
 end
 
-describe 'docker_operations' do
+RSpec.describe 'docker_operations' do
   describe 'without docker operations timeout variable' do
     it 'sets default value as timeout' do
       DockerOperations.set_timeout
diff --git a/spec/gitlab/tasks/license_spec.rb b/spec/gitlab/tasks/license_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvdGFza3MvbGljZW5zZV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvdGFza3MvbGljZW5zZV9zcGVjLnJi 100644
--- a/spec/gitlab/tasks/license_spec.rb
+++ b/spec/gitlab/tasks/license_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'license:check', type: :rake do
+RSpec.describe 'license:check', type: :rake do
   let(:f) { double("Mocked file object") }
 
   before :all do
diff --git a/spec/gitlab/tasks/metrics_spec.rb b/spec/gitlab/tasks/metrics_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvdGFza3MvbWV0cmljc19zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvdGFza3MvbWV0cmljc19zcGVjLnJi 100644
--- a/spec/gitlab/tasks/metrics_spec.rb
+++ b/spec/gitlab/tasks/metrics_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'metrics', type: :rake do
+RSpec.describe 'metrics', type: :rake do
   let(:gitlab_registry_image_address) { 'dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ce-qa' }
   let(:gitlab_version) { '10.2.0' }
   let(:image_tag) { 'omnibus-12345' }
diff --git a/spec/gitlab/tasks/qa_spec.rb b/spec/gitlab/tasks/qa_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvdGFza3MvcWFfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvdGFza3MvcWFfc3BlYy5yYg== 100644
--- a/spec/gitlab/tasks/qa_spec.rb
+++ b/spec/gitlab/tasks/qa_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'qa', type: :rake do
+RSpec.describe 'qa', type: :rake do
   let(:gitlab_registry_image_address) { 'dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ce-qa' }
   let(:gitlab_version) { '10.2.0' }
   let(:commit_sha) { 'abcd1234' }
diff --git a/spec/gitlab/util_spec.rb b/spec/gitlab/util_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvdXRpbF9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvdXRpbF9zcGVjLnJi 100644
--- a/spec/gitlab/util_spec.rb
+++ b/spec/gitlab/util_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/util'
 
-describe Gitlab::Util do
+RSpec.describe Gitlab::Util do
   describe :get_env do
     it 'strips value of env variable correctly' do
       allow(ENV).to receive(:[]).with('foo').and_return('  bar  ')
diff --git a/spec/gitlab/version_spec.rb b/spec/gitlab/version_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9naXRsYWIvdmVyc2lvbl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9naXRsYWIvdmVyc2lvbl9zcGVjLnJi 100644
--- a/spec/gitlab/version_spec.rb
+++ b/spec/gitlab/version_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'gitlab/version'
 
-describe Gitlab::Version do
+RSpec.describe Gitlab::Version do
   describe '.sources_channel' do
     subject { described_class }
 
diff --git a/spec/libraries/account_helper_spec.rb b/spec/libraries/account_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvYWNjb3VudF9oZWxwZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvYWNjb3VudF9oZWxwZXJfc3BlYy5yYg== 100644
--- a/spec/libraries/account_helper_spec.rb
+++ b/spec/libraries/account_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe AccountHelper do
+RSpec.describe AccountHelper do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
 
   it 'returns a list of users' do
diff --git a/spec/libraries/config_mash_spec.rb b/spec/libraries/config_mash_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvY29uZmlnX21hc2hfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvY29uZmlnX21hc2hfc3BlYy5yYg== 100644
--- a/spec/libraries/config_mash_spec.rb
+++ b/spec/libraries/config_mash_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative '../../files/gitlab-cookbooks/package/libraries/config_mash'
 
-describe Gitlab::ConfigMash do
+RSpec.describe Gitlab::ConfigMash do
   let(:mash) { Gitlab::ConfigMash.new }
 
   it 'behaves like a normal Mash by default' do
diff --git a/spec/libraries/deprecations_spec.rb b/spec/libraries/deprecations_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvZGVwcmVjYXRpb25zX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvZGVwcmVjYXRpb25zX3NwZWMucmI= 100644
--- a/spec/libraries/deprecations_spec.rb
+++ b/spec/libraries/deprecations_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative '../../files/gitlab-cookbooks/package/libraries/deprecations'
 
-describe Gitlab::Deprecations do
+RSpec.describe Gitlab::Deprecations do
   let(:valid_config) { { gitlab: { nginx: { listen_addresses: "SomeRandomString" } } } }
   let(:invalid_config) do
     {
diff --git a/spec/libraries/gitaly_spec.rb b/spec/libraries/gitaly_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvZ2l0YWx5X3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvZ2l0YWx5X3NwZWMucmI= 100644
--- a/spec/libraries/gitaly_spec.rb
+++ b/spec/libraries/gitaly_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe Gitaly do
+RSpec.describe Gitaly do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
   before { allow(Gitlab).to receive(:[]).and_call_original }
 
diff --git a/spec/libraries/gitlab_spec.rb b/spec/libraries/gitlab_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvZ2l0bGFiX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvZ2l0bGFiX3NwZWMucmI= 100644
--- a/spec/libraries/gitlab_spec.rb
+++ b/spec/libraries/gitlab_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative '../../files/gitlab-cookbooks/package/libraries/config/gitlab'
 
-describe Gitlab do
+RSpec.describe Gitlab do
   context 'when using an attribute_block' do
     it 'sets top level attributes to the provided root' do
       Gitlab.attribute_block('gitlab') do
diff --git a/spec/libraries/helper_spec.rb b/spec/libraries/helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvaGVscGVyX3NwZWMucmI= 100644
--- a/spec/libraries/helper_spec.rb
+++ b/spec/libraries/helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-shared_examples 'Postgres helpers' do |service_name, service_cmd, edition|
+RSpec.shared_examples 'Postgres helpers' do |service_name, service_cmd, edition|
   let(:chef_run) do
     ChefSpec::SoloRunner.new do |node|
       node.normal['gitlab'][service_name]['data_dir'] = '/fakedir'
@@ -65,7 +65,7 @@
   end
 end
 
-describe PgHelper do
+RSpec.describe PgHelper do
   include_examples 'Postgres helpers', 'postgresql', 'gitlab-psql', 'gitlab'
 end
 
@@ -69,7 +69,7 @@
   include_examples 'Postgres helpers', 'postgresql', 'gitlab-psql', 'gitlab'
 end
 
-describe GeoPgHelper do
+RSpec.describe GeoPgHelper do
   before do
     allow(Gitlab).to receive(:[]).and_call_original
     stub_gitlab_rb(
@@ -82,7 +82,7 @@
   include_examples 'Postgres helpers', 'geo-postgresql', 'gitlab-geo-psql', 'gitlab-ee'
 end
 
-describe OmnibusHelper do
+RSpec.describe OmnibusHelper do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
   let(:node) { chef_run.node }
   let(:services) do
diff --git a/spec/libraries/helpers/base_pg_helper_spec.rb b/spec/libraries/helpers/base_pg_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvaGVscGVycy9iYXNlX3BnX2hlbHBlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvaGVscGVycy9iYXNlX3BnX2hlbHBlcl9zcGVjLnJi 100644
--- a/spec/libraries/helpers/base_pg_helper_spec.rb
+++ b/spec/libraries/helpers/base_pg_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe BasePgHelper do
+RSpec.describe BasePgHelper do
   cached(:chef_run) { converge_config }
   let(:node) { chef_run.node }
   subject { described_class.new(node) }
diff --git a/spec/libraries/helpers/pgbouncer_helper_spec.rb b/spec/libraries/helpers/pgbouncer_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvaGVscGVycy9wZ2JvdW5jZXJfaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvaGVscGVycy9wZ2JvdW5jZXJfaGVscGVyX3NwZWMucmI= 100644
--- a/spec/libraries/helpers/pgbouncer_helper_spec.rb
+++ b/spec/libraries/helpers/pgbouncer_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe PgbouncerHelper do
+RSpec.describe PgbouncerHelper do
   cached(:chef_run) { converge_config }
   let(:node) { chef_run.node }
   subject { described_class.new(node) }
diff --git a/spec/libraries/lets_encrypt_spec.rb b/spec/libraries/lets_encrypt_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvbGV0c19lbmNyeXB0X3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvbGV0c19lbmNyeXB0X3NwZWMucmI= 100644
--- a/spec/libraries/lets_encrypt_spec.rb
+++ b/spec/libraries/lets_encrypt_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe LetsEncrypt do
+RSpec.describe LetsEncrypt do
   subject { ::LetsEncrypt }
 
   before do
diff --git a/spec/libraries/logging_helper_spec.rb b/spec/libraries/logging_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvbG9nZ2luZ19oZWxwZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvbG9nZ2luZ19oZWxwZXJfc3BlYy5yYg== 100644
--- a/spec/libraries/logging_helper_spec.rb
+++ b/spec/libraries/logging_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe LoggingHelper do
+RSpec.describe LoggingHelper do
   let(:log) { spy('Chef::Log') }
 
   before do
diff --git a/spec/libraries/omnibus_helper_spec.rb b/spec/libraries/omnibus_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvb21uaWJ1c19oZWxwZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvb21uaWJ1c19oZWxwZXJfc3BlYy5yYg== 100644
--- a/spec/libraries/omnibus_helper_spec.rb
+++ b/spec/libraries/omnibus_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe OmnibusHelper do
+RSpec.describe OmnibusHelper do
   cached(:chef_run) { converge_config }
   let(:node) { chef_run.node }
 
diff --git a/spec/libraries/output_helper_spec.rb b/spec/libraries/output_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvb3V0cHV0X2hlbHBlcl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvb3V0cHV0X2hlbHBlcl9zcGVjLnJi 100644
--- a/spec/libraries/output_helper_spec.rb
+++ b/spec/libraries/output_helper_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative '../../files/gitlab-cookbooks/package/libraries/helpers/output_helper'
 
-describe OutputHelper do
+RSpec.describe OutputHelper do
   include OutputHelper
 
   describe "#quote" do
diff --git a/spec/libraries/pg_version_spec.rb b/spec/libraries/pg_version_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvcGdfdmVyc2lvbl9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvcGdfdmVyc2lvbl9zcGVjLnJi 100644
--- a/spec/libraries/pg_version_spec.rb
+++ b/spec/libraries/pg_version_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe PGVersion do
+RSpec.describe PGVersion do
   context '.parse' do
     it 'returns a PGVersion class when provided a value' do
       expect(PGVersion.parse('string')).to be_a(described_class)
diff --git a/spec/libraries/redis_helper_spec.rb b/spec/libraries/redis_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvcmVkaXNfaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvcmVkaXNfaGVscGVyX3NwZWMucmI= 100644
--- a/spec/libraries/redis_helper_spec.rb
+++ b/spec/libraries/redis_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe RedisHelper do
+RSpec.describe RedisHelper do
   let(:chef_run) { converge_config }
   subject { described_class.new(chef_run.node) }
 
diff --git a/spec/libraries/redis_spec.rb b/spec/libraries/redis_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvcmVkaXNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvcmVkaXNfc3BlYy5yYg== 100644
--- a/spec/libraries/redis_spec.rb
+++ b/spec/libraries/redis_spec.rb
@@ -2,7 +2,7 @@
 # are the ones we expect
 require 'chef_helper'
 
-describe 'Redis' do
+RSpec.describe 'Redis' do
   let(:chef_run) { converge_config }
   let(:node) { chef_run.node }
   subject { ::Redis }
diff --git a/spec/libraries/redis_uri_spec.rb b/spec/libraries/redis_uri_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvcmVkaXNfdXJpX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvcmVkaXNfdXJpX3NwZWMucmI= 100644
--- a/spec/libraries/redis_uri_spec.rb
+++ b/spec/libraries/redis_uri_spec.rb
@@ -4,7 +4,7 @@
 require 'spec_helper'
 require_relative '../../files/gitlab-cookbooks/gitlab/libraries/redis_uri.rb'
 
-describe URI::Redis do
+RSpec.describe URI::Redis do
   subject { URI('redis://localhost') }
 
   it { is_expected.to be_a(described_class) }
diff --git a/spec/libraries/registry_spec.rb b/spec/libraries/registry_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvcmVnaXN0cnlfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvcmVnaXN0cnlfc3BlYy5yYg== 100644
--- a/spec/libraries/registry_spec.rb
+++ b/spec/libraries/registry_spec.rb
@@ -1,7 +1,7 @@
 require 'chef_helper'
 require_relative '../../files/gitlab-cookbooks/gitlab/libraries/registry'
 
-describe Registry do
+RSpec.describe Registry do
   before do
     allow(Gitlab).to receive(:[]).and_call_original
   end
diff --git a/spec/libraries/roles_spec.rb b/spec/libraries/roles_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvcm9sZXNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvcm9sZXNfc3BlYy5yYg== 100644
--- a/spec/libraries/roles_spec.rb
+++ b/spec/libraries/roles_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe 'GitLabRoles' do
+RSpec.describe 'GitLabRoles' do
   before do
     allow(Gitlab).to receive(:[]).and_call_original
     allow(Services).to receive(:enable_group).and_call_original
diff --git a/spec/libraries/sentinel_helper_spec.rb b/spec/libraries/sentinel_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvc2VudGluZWxfaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvc2VudGluZWxfaGVscGVyX3NwZWMucmI= 100644
--- a/spec/libraries/sentinel_helper_spec.rb
+++ b/spec/libraries/sentinel_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe SentinelHelper do
+RSpec.describe SentinelHelper do
   let(:chef_run) { converge_config(is_ee: true) }
   subject { described_class.new(chef_run.node) }
   before { allow(Gitlab).to receive(:[]).and_call_original }
diff --git a/spec/libraries/sentinel_spec.rb b/spec/libraries/sentinel_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvc2VudGluZWxfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvc2VudGluZWxfc3BlYy5yYg== 100644
--- a/spec/libraries/sentinel_spec.rb
+++ b/spec/libraries/sentinel_spec.rb
@@ -2,7 +2,7 @@
 # are the ones we expect
 require 'chef_helper'
 
-describe 'Sentinel' do
+RSpec.describe 'Sentinel' do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::config') }
   let(:node) { chef_run.node }
   subject { ::Sentinel }
diff --git a/spec/libraries/services_spec.rb b/spec/libraries/services_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvc2VydmljZXNfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvc2VydmljZXNfc3BlYy5yYg== 100644
--- a/spec/libraries/services_spec.rb
+++ b/spec/libraries/services_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe Services do
+RSpec.describe Services do
   before { allow(Gitlab).to receive(:[]).and_call_original }
 
   describe 'when using the gitlab cookbook' do
diff --git a/spec/libraries/sidekiq_cluster_spec.rb b/spec/libraries/sidekiq_cluster_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvc2lkZWtpcV9jbHVzdGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvc2lkZWtpcV9jbHVzdGVyX3NwZWMucmI= 100644
--- a/spec/libraries/sidekiq_cluster_spec.rb
+++ b/spec/libraries/sidekiq_cluster_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe SidekiqCluster do
+RSpec.describe SidekiqCluster do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
   before { allow(Gitlab).to receive(:[]).and_call_original }
 
diff --git a/spec/libraries/sidekiq_spec.rb b/spec/libraries/sidekiq_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvc2lkZWtpcV9zcGVjLnJi..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvc2lkZWtpcV9zcGVjLnJi 100644
--- a/spec/libraries/sidekiq_spec.rb
+++ b/spec/libraries/sidekiq_spec.rb
@@ -1,7 +1,7 @@
 require 'chef_helper'
 require 'pry'
 
-describe Sidekiq do
+RSpec.describe Sidekiq do
   let(:chef_run) { ChefSpec::SoloRunner.converge('gitlab::default') }
   before { allow(Gitlab).to receive(:[]).and_call_original }
 
diff --git a/spec/libraries/storage_directory_helper_spec.rb b/spec/libraries/storage_directory_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvc3RvcmFnZV9kaXJlY3RvcnlfaGVscGVyX3NwZWMucmI=..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvc3RvcmFnZV9kaXJlY3RvcnlfaGVscGVyX3NwZWMucmI= 100644
--- a/spec/libraries/storage_directory_helper_spec.rb
+++ b/spec/libraries/storage_directory_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'chef_helper'
 
-describe StorageDirectoryHelper do
+RSpec.describe StorageDirectoryHelper do
   let(:success_shell) do
     shell = instance_double(Mixlib::ShellOut)
     allow(shell).to receive(:exitstatus).and_return(0)
diff --git a/spec/libraries/systemd_helper_spec.rb b/spec/libraries/systemd_helper_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9saWJyYXJpZXMvc3lzdGVtZF9oZWxwZXJfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9saWJyYXJpZXMvc3lzdGVtZF9oZWxwZXJfc3BlYy5yYg== 100644
--- a/spec/libraries/systemd_helper_spec.rb
+++ b/spec/libraries/systemd_helper_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative '../../files/gitlab-cookbooks/package/libraries/helpers/systemd_helper'
 
-describe SystemdHelper do
+RSpec.describe SystemdHelper do
   describe '#systemd_version' do
     context 'when systemctl returns valid output' do
       before do
diff --git a/spec/rubocop/cop/avoid_using_env_spec.rb b/spec/rubocop/cop/avoid_using_env_spec.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9ydWJvY29wL2NvcC9hdm9pZF91c2luZ19lbnZfc3BlYy5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9ydWJvY29wL2NvcC9hdm9pZF91c2luZ19lbnZfc3BlYy5yYg== 100644
--- a/spec/rubocop/cop/avoid_using_env_spec.rb
+++ b/spec/rubocop/cop/avoid_using_env_spec.rb
@@ -3,7 +3,7 @@
 require_relative '../../../lib/rubocop/cop/avoid_using_env'
 require_relative '../../support/rubocop_helper.rb'
 
-describe Rubocop::Cop::AvoidUsingEnv do
+RSpec.describe Rubocop::Cop::AvoidUsingEnv do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 426b8f156c9346f3c66b68bcc0b510eca53a7d7d_c3BlYy9zcGVjX2hlbHBlci5yYg==..be0be521946aa5d619ce1a665af081f6f30914d4_c3BlYy9zcGVjX2hlbHBlci5yYg== 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,4 +20,6 @@
 
   config.include(GitlabSpec::Macros)
   config.include ExpectOffense
+
+  config.disable_monkey_patching!
 end