Merge branch '34753-improve-the-scripts-review_apps-automated_cleanup-rb-script' into 'master'

Improve the scripts/review_apps/automated_cleanup.rb script

Closes #34753

See merge request gitlab-org/gitlab!18992

.gitlab/ci/review.gitlab-ci.yml

@@ -35,14 +35,12 @@ build-qa-image:
     - echo "${CI_JOB_TOKEN}" | docker login --username gitlab-ci-token --password-stdin ${CI_REGISTRY}
     - time docker push ${QA_IMAGE}
 
-schedule:review-cleanup:
+.base-review-cleanup:
   extends:
     - .default-tags
     - .default-retry
     - .default-only
     - .only-code-qa-changes
-    - .only-review-schedules
-    - .except-deploys
   stage: prepare
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
   allow_failure: true
@@ -55,6 +53,16 @@ schedule:review-cleanup:
   script:
     - ruby -rrubygems scripts/review_apps/automated_cleanup.rb
 
+schedule:review-cleanup:
+  extends:
+    - .base-review-cleanup
+    - .only-review-schedules
+
+manual:review-cleanup:
+  extends:
+    - .base-review-cleanup
+  when: manual
+
 .review-build-cng-base:
   extends:
     - .default-only

scripts/review_apps/automated_cleanup.rb

@@ -58,8 +58,11 @@ class AutomatedCleanup
     checked_environments = []
     delete_threshold = threshold_time(days: days_for_delete)
     stop_threshold = threshold_time(days: days_for_stop)
+    deployments_look_back_threshold = threshold_time(days: days_for_delete * 5)
+
+    gitlab.deployments(project_path, per_page: DEPLOYMENTS_PER_PAGE, sort: 'desc').auto_paginate do |deployment|
+      break if Time.parse(deployment.created_at) < deployments_look_back_threshold
 
-    gitlab.deployments(project_path, per_page: DEPLOYMENTS_PER_PAGE).auto_paginate do |deployment|
       environment = deployment.environment
 
       next unless environment
@@ -89,6 +92,9 @@ class AutomatedCleanup
     threshold_day = threshold_time(days: days)
 
     helm_releases.each do |release|
+      # Prevents deleting `dns-gitlab-review-app` releases or other unrelated releases
+      next unless release.name.start_with?('review-')
+
       if release.status == 'FAILED' || release.last_update < threshold_day
         delete_helm_release(release)
       else