Revert "Merge branch 'fix-nightly-in-canonical-rat' into 'master'"

This reverts merge request !7460 because the `Trigger:package` job
was not present.  Adding it would build the Ubuntu package twice, so
we chose to revert and determine if this can be done with the
package already built in the pipeline.

Author: Ryan Egesdahl

gitlab-ci-config/dev-gitlab-org.yml

@@ -433,6 +433,37 @@ Raspberry-Pi-2-Bookworm-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:${BUILDER_IMAGE_REVISION}"
   extends: .rpi_branch_template
 
+# This job runs only on nightly EE builds
+RAT-Nightly:
+  stage: slow_jobs
+  image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
+  script:
+    - bundle exec rake qa:rat:nightly
+  cache: !reference [.branch-cache]
+  needs:
+    - Ubuntu-22.04-branch
+  allow_failure: true
+  rules:
+    - !reference [.default_rules, rules]
+    - if: '$PIPELINE_TYPE == "EE_NIGHTLY_BUILD_PIPELINE"'
+
+# This job runs only on nightly EE builds
+RAT-Nightly-FIPS:
+  stage: slow_jobs
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
+  variables:
+    USE_SYSTEM_SSL: "true"
+    RAT_REFERENCE_ARCHITECTURE: "omnibus-gitlab-mrs-fips"
+  script:
+    - bundle exec rake qa:rat:nightly
+  cache: !reference [.branch-cache]
+  needs:
+    - AlmaLinux-8-fips-branch
+  allow_failure: true
+  rules:
+    - !reference [.default_rules, rules]
+    - if: '$PIPELINE_TYPE == "EE_NIGHTLY_BUILD_PIPELINE"'
+
 ############################
 #     Release pipeline     #
 ############################

gitlab-ci-config/gitlab-com.yml

@@ -666,8 +666,6 @@ RAT:
     - if: '$PIPELINE_TYPE == "TRIGGERED_EE_PIPELINE"'
       when: manual
       allow_failure: true
-    - if: '$PIPELINE_TYPE == "EE_NIGHTLY_BUILD_PIPELINE"'
-      allow_failure: true
   needs:
     - job: Trigger:package
       artifacts: false

gitlab-ci-config/workflow-rules.yml

@@ -43,6 +43,9 @@ workflow:
     - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $CANONICAL_PROJECT_PATH && $CI_PIPELINE_SOURCE == "merge_request_event"'
       variables:
         PIPELINE_TYPE: GITLAB_MR_PIPELINE
+    - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $CANONICAL_PROJECT_PATH && $CI_COMMIT_REF_PROTECTED == "true"'
+      variables:
+        PIPELINE_TYPE: PROTECTED_TEST_PIPELINE
     - if: '$PIPELINE_TYPE == null && $NIGHTLY && $CI_COMMIT_BRANCH && ($ee == "true" || $GITLAB_VERSION =~ /-ee$/)'
       variables:
         PIPELINE_TYPE: EE_NIGHTLY_BUILD_PIPELINE
@@ -91,9 +94,6 @@ workflow:
         PIPELINE_TYPE: EE_TAG_BUILD_PIPELINE
         CACHE_EDITION: "EE"
         GITLAB_EDITION: "Enterprise Edition"
-    - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $CANONICAL_PROJECT_PATH && $CI_COMMIT_REF_PROTECTED == "true"'
-      variables:
-        PIPELINE_TYPE: PROTECTED_TEST_PIPELINE
     - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $SECURITY_PROJECT_PATH && $CI_PIPELINE_SOURCE == "merge_request_event"'
       variables:
         PIPELINE_TYPE: GITLAB_MR_PIPELINE

lib/gitlab/build/facts.rb

@@ -30,17 +30,9 @@ def get_component_shas(version_manifest_file = 'version-manifest.json')
         softwares = version_manifest['software']
         results = {}
         Gitlab::Version::COMPONENTS_ENV_VARS.keys.map do |component|
-          # For both `gitlab-rails` and `gitlab-rails-ee`, the key in
-          # version-manifest.json is `gitlab-rails`
-          version_manifest_key = if component == 'gitlab-rails' || component == 'gitlab-rails-ee'
-                                   'gitlab-rails'
-                                 else
-                                   component
-                                 end
+          next unless softwares.key?(component)
 
-          next unless softwares.key?(version_manifest_key)
-
-          results[component] = softwares[version_manifest_key]['locked_version']
+          results[component] = softwares[component]['locked_version']
         end
 
         results

spec/lib/gitlab/build/facts_spec.rb

@@ -69,7 +69,6 @@
   let(:component_shas) do
     {
       'gitlab-rails' => '6f286d7717f419489a08a9918621f438256e397b',
-      'gitlab-rails-ee' => '6f286d7717f419489a08a9918621f438256e397b',
       'gitaly' => 'b55578ec476e8bc8ecd9775ee7e9960b52e0f6e0',
       'gitlab-shell' => '264d63e81cbf08e3ae75e84433b8d09af15f351f',
       'gitlab-pages' => 'b0cb1f0c0783db2f5176301e6528fe41e1b42abf',