Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 12 deletions

diff --git a/scripts/generate-e2e-pipeline b/scripts/generate-e2e-pipeline
index aef2447e800..c612a700f90 100755
--- a/scripts/generate-e2e-pipeline
+++ b/scripts/generate-e2e-pipeline
@@ -22,16 +22,19 @@ fi
 qa_cache_key="qa-e2e-ruby-${RUBY_VERSION}-$(md5sum qa/Gemfile.lock | awk '{ print $1 }')"
 variables=$(cat <<YML
 variables:
+  COLORIZED_LOGS: "true"
+  GIT_DEPTH: "20"
+  GIT_STRATEGY: "clone" # 'GIT_STRATEGY: clone' optimizes the pack-objects cache hit ratio
+  GIT_SUBMODULE_STRATEGY: "none"
   GITLAB_QA_CACHE_KEY: "$qa_cache_key"
   GITLAB_VERSION: "$(cat VERSION)"
-  COLORIZED_LOGS: "true"
   QA_EXPORT_TEST_METRICS: "${QA_EXPORT_TEST_METRICS:-true}"
-  QA_SAVE_TEST_METRICS: "${QA_SAVE_TEST_METRICS:-false}"
-  QA_RUN_ALL_TESTS: "${QA_RUN_ALL_TESTS:-false}"
-  QA_FRAMEWORK_CHANGES: "${QA_FRAMEWORK_CHANGES:-false}"
   QA_FEATURE_FLAGS: "${QA_FEATURE_FLAGS}"
-  QA_TESTS: "$QA_TESTS"
+  QA_FRAMEWORK_CHANGES: "${QA_FRAMEWORK_CHANGES:-false}"
+  QA_RUN_ALL_TESTS: "${QA_RUN_ALL_TESTS:-false}"
+  QA_SAVE_TEST_METRICS: "${QA_SAVE_TEST_METRICS:-false}"
   QA_SUITES: "$QA_SUITES"
+  QA_TESTS: "$QA_TESTS"
 YML
 )
 
diff --git a/scripts/review_apps/automated_cleanup.rb b/scripts/review_apps/automated_cleanup.rb
index f459cb9c0ea..07444fbd850 100755
--- a/scripts/review_apps/automated_cleanup.rb
+++ b/scripts/review_apps/automated_cleanup.rb
@@ -294,10 +294,6 @@ if $PROGRAM_NAME == __FILE__
 
   automated_cleanup = ReviewApps::AutomatedCleanup.new(options: options)
 
-  timed('Review Apps cleanup') do
-    automated_cleanup.perform_gitlab_environment_cleanup!(days_for_stop: 5, days_for_delete: 6)
-  end
-
   timed('Docs Review Apps cleanup') do
     automated_cleanup.perform_gitlab_docs_environment_cleanup!(days_for_stop: 20, days_for_delete: 30)
   end
@@ -305,11 +301,11 @@ if $PROGRAM_NAME == __FILE__
   puts
 
   timed('Helm releases cleanup') do
-    automated_cleanup.perform_helm_releases_cleanup!(days: 7)
+    automated_cleanup.perform_helm_releases_cleanup!(days: 2)
   end
 
   timed('Stale Namespace cleanup') do
-    automated_cleanup.perform_stale_namespace_cleanup!(days: 14)
+    automated_cleanup.perform_stale_namespace_cleanup!(days: 3)
   end
 
   timed('Stale PVC cleanup') do
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml
index 4d0f0ffec42..1d062a76191 100644
--- a/scripts/review_apps/base-config.yaml
+++ b/scripts/review_apps/base-config.yaml
@@ -91,7 +91,7 @@ gitlab:
         memory: 1927Mi
       limits:
         cpu: 450m
-        memory: 2890Mi
+        memory: 3500Mi
 
   webservice:
     resources: