Add latest changes from gitlab-org/gitlab@master

2 files changed, 45 insertions, 25 deletions

diff --git a/.gitlab/ci/preflight.gitlab-ci.yml b/.gitlab/ci/preflight.gitlab-ci.yml
index e477466e5f3..968402b2ea5 100644
--- a/.gitlab/ci/preflight.gitlab-ci.yml
+++ b/.gitlab/ci/preflight.gitlab-ci.yml
@@ -16,20 +16,23 @@
     - !reference [.default-before_script, before_script]
     - cd qa && bundle install
 
-rails-production-server-boot:
+.rails-production-server-boot:
   extends:
     - .preflight-job-base
     - .default-before_script
     - .production
     - .ruby-cache
-    - .setup:rules:rails-production-server-boot
+    - .preflight:rules:rails-production-server-boot
     - .use-pg13
   variables:
     BUNDLE_WITHOUT: "development:test"
     BUNDLE_WITH: "production"
-  needs: []
+
+# Test the puma configuration present in `config/puma.rb.example`
+rails-production-server-boot-puma-example:
+  extends:
+    - .rails-production-server-boot
   script:
-    - source scripts/utils.sh
     - cp config/puma.rb.example config/puma.rb
     - sed --in-place "s:/home/git/gitlab:${PWD}:" config/puma.rb
     - echo 'bind "tcp://127.0.0.1:3000"' >> config/puma.rb
@@ -38,17 +41,30 @@ rails-production-server-boot:
     - retry_times_sleep 10 5 "curl http://127.0.0.1:3000"
     - kill $(jobs -p)
 
+# Test the puma configuration present in
+# https://gitlab.com/gitlab-org/build/CNG/-/raw/master/gitlab-webservice/configuration/puma.rb
+rails-production-server-boot-puma-cng:
+  extends:
+    - .rails-production-server-boot
+  script:
+    - curl --silent https://gitlab.com/gitlab-org/build/CNG/-/raw/master/gitlab-webservice/configuration/puma.rb > config/puma.rb
+    - sed --in-place "s:/srv/gitlab:${PWD}:" config/puma.rb
+    - bundle exec puma --environment production --config config/puma.rb &
+    - sleep 40  # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114124#note_1309506358
+    - retry_times_sleep 10 5 "curl http://127.0.0.1:8080"
+    - kill $(jobs -p)
+
 no-ee-check:
   extends:
     - .preflight-job-base
-    - .setup:rules:no-ee-check
+    - .preflight:rules:no-ee-check
   script:
     - scripts/no-dir-check ee
 
 no-jh-check:
   extends:
     - .preflight-job-base
-    - .setup:rules:no-jh-check
+    - .preflight:rules:no-jh-check
   script:
     - scripts/no-dir-check jh
 
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 9390d89212c..a37d0e2be37 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -2477,25 +2477,6 @@
     - <<: *if-default-refs
       changes: *code-backstage-patterns
 
-.setup:rules:rails-production-server-boot:
-  rules:
-    - <<: *if-default-refs
-      changes: *code-patterns
-
-.setup:rules:no-ee-check:
-  rules:
-    - <<: *if-not-foss
-      when: never
-    - <<: *if-default-refs
-      changes: *code-backstage-patterns
-
-.setup:rules:no-jh-check:
-  rules:
-    - <<: *if-jh
-      when: never
-    - <<: *if-default-refs
-      changes: *code-backstage-patterns
-
 .setup:rules:verify-ruby-3.0:
   rules:
     - <<: *if-merge-request-labels-run-in-ruby2
@@ -2527,6 +2508,29 @@
         - "scripts/rspec_helpers.sh"
 
 #######################
+# Preflight rules #
+#######################
+
+.preflight:rules:rails-production-server-boot:
+  rules:
+    - <<: *if-default-refs
+      changes: *code-patterns
+
+.preflight:rules:no-ee-check:
+  rules:
+    - <<: *if-not-foss
+      when: never
+    - <<: *if-default-refs
+      changes: *code-backstage-patterns
+
+.preflight:rules:no-jh-check:
+  rules:
+    - <<: *if-jh
+      when: never
+    - <<: *if-default-refs
+      changes: *code-backstage-patterns
+
+#######################
 # Test metadata rules #
 #######################
 .test-metadata:rules:retrieve-tests-metadata: