Merge branch '8114-deduplicate-check-packages' into 'master'

Use PIPELINE_TYPE logic in check-packages-* pipeline

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/8051



Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Hossein Pursultani <hpursultani@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>

gitlab-ci-config/check-packages.yml

@@ -8,21 +8,6 @@ variables:
   # hardcoding the dev registry for SLES jobs.
   DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder'
-.ee-tag-only:
-  rules:
-    # SLES job might not have connection to RMT server to install additional packages
-    # FIPS packages won't necessarily work in a non-fips environment
-    - if: '$deploy_instance == "true"'
-      when: never
-    - if: '$CI_COMMIT_TAG =~ /^.*ee\.\d.*$/'
-
-.ce-tag-only:
-  rules:
-    # RPi packages are not uploaded to pre-release repo.
-    - if: '$deploy_instance == "true"'
-      when: never
-    - if: '$CI_COMMIT_TAG =~ /^.*ce\.\d.*$/'
-
 .distribution-amd64-tags:
   - distribution-runner
   - amd64
@@ -109,33 +94,33 @@ Debian-12-arm64-check:
   extends: .apt-arm-install
 Raspberry-Pi-2-Buster-check:
   image: "${BUILDER_IMAGE_REGISTRY}/rpi_10:latest"
-  extends:
-    - .apt-install
-    - .ce-tag-only
+  extends: .apt-install
+  rules:
+    - if: '$PIPELINE_TYPE == "CE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
   variables:
     package_repository: 'raspberry-pi2'
   tags: !reference [.distribution-armhf-tags]
 Raspberry-Pi-2-Bullseye-check:
   image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:latest"
-  extends:
-    - .apt-install
-    - .ce-tag-only
+  extends: .apt-install
+  rules:
+    - if: '$PIPELINE_TYPE == "CE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
   variables:
     package_repository: 'raspberry-pi2'
   tags: !reference [.distribution-armhf-tags]
 Raspberry-Pi-2-Bookworm-check:
   image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:latest"
-  extends:
-    - .apt-install
-    - .ce-tag-only
+  extends: .apt-install
+  rules:
+    - if: '$PIPELINE_TYPE == "CE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
   variables:
     package_repository: 'raspberry-pi2'
   tags: !reference [.distribution-armhf-tags]
 Ubuntu-20.04-fips-check:
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:latest"
-  extends:
-    - .apt-install
-    - .ee-tag-only
+  extends: .apt-install
+  rules:
+    - if: '$PIPELINE_TYPE == "EE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
   variables:
     USE_SYSTEM_SSL: "true"
@@ -169,23 +154,23 @@ AmazonLinux-2023-arm64-check:
   extends: .yum-arm-install
 AlmaLinux-8-fips-check:
   image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:latest"
-  extends:
-    - .yum-install
-    - .ee-tag-only
+  extends: .yum-install
+  rules:
+    - if: '$PIPELINE_TYPE == "EE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
   variables:
     USE_SYSTEM_SSL: "true"
 AlmaLinux-9-fips-check:
   image: "${BUILDER_IMAGE_REGISTRY}/almalinux_9_fips:latest"
-  extends:
-    - .yum-install
-    - .ee-tag-only
+  extends: .yum-install
+  rules:
+    - if: '$PIPELINE_TYPE == "EE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
   variables:
     USE_SYSTEM_SSL: "true"
 AmazonLinux-2-fips-check:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:latest"
-  extends:
-    - .yum-install
-    - .ee-tag-only
+  extends: .yum-install
+  rules:
+    - if: '$PIPELINE_TYPE == "EE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
   variables:
     USE_SYSTEM_SSL: "true"
@@ -204,14 +189,14 @@ OpenSUSE-15.6-arm64-check:
   extends: .zypper-arm-install
 SLES-12.5-check:
   image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_12sp5:latest"
-  extends:
-    - .zypper-install
-    - .ee-tag-only
+  extends: .zypper-install
+  rules:
+    - if: '$PIPELINE_TYPE == "EE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
 SLES-15.2-check:
   image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_15sp2:latest"
-  extends:
-    - .zypper-install
-    - .ee-tag-only
+  extends: .zypper-install
+  rules:
+    - if: '$PIPELINE_TYPE == "EE_CHECK_PACKAGE_AVAILABILITY_PIPELINE"'
 Docker:
   stage: image

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

@@ -1153,16 +1153,21 @@ check-packages-functionality:
   allow_failure: true
   trigger:
     include: '/gitlab-ci-config/check-packages.yml'
+  variables:
+    deploy_instance: "true"
+    package_repository: "${STAGING_REPO}"
+    package_repo_token: "${STAGING_REPO_TOKEN}:@"
+    image_registry: "${CI_REGISTRY_IMAGE}"
   rules:
     - !reference [.default_rules, rules]
     - if: '$SKIP_PACKAGE_FUNCTIONALITY_CHECK'
       when: never
-    - if: '$PIPELINE_TYPE =~ /_(RC|TAG)_BUILD_PIPELINE$/'
+    - if: '$PIPELINE_TYPE =~ /CE_(RC|TAG)_BUILD_PIPELINE$/'
+      variables:
+        PIPELINE_TYPE: 'CE_CHECK_PACKAGE_FUNCTIONALITY_PIPELINE'
+    - if: '$PIPELINE_TYPE =~ /EE_(RC|TAG)_BUILD_PIPELINE$/'
       variables:
-        deploy_instance: "true"
-        package_repository: "${STAGING_REPO}"
-        package_repo_token: "${STAGING_REPO_TOKEN}:@"
-        image_registry: "${CI_REGISTRY_IMAGE}"
+        PIPELINE_TYPE: 'EE_CHECK_PACKAGE_FUNCTIONALITY_PIPELINE'
 # Check if the packages are available from public repositories
 check-packages-availability:
@@ -1171,7 +1176,12 @@ check-packages-availability:
     include: '/gitlab-ci-config/check-packages.yml'
   rules:
     - !reference [.default_rules, rules]
-    - if: '$PIPELINE_TYPE =~ /_TAG_BUILD_PIPELINE$/'
+    - if: '$PIPELINE_TYPE =~ /CE_TAG_BUILD_PIPELINE$/'
+      variables:
+        PIPELINE_TYPE: 'CE_CHECK_PACKAGE_AVAILABILITY_PIPELINE'
+    - if: '$PIPELINE_TYPE =~ /EE_TAG_BUILD_PIPELINE$/'
+      variables:
+        PIPELINE_TYPE: 'EE_CHECK_PACKAGE_AVAILABILITY_PIPELINE'
 create-gitlab-release:
   stage: package-and-image-release