Merge branch 'use-almalinux-8-builders' into 'master'

Use AlmaLinux 8 for EL8 package builds

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



Merged-by: Jason Plum <jplum@gitlab.com>
Approved-by: Dustin Collins <714871-dustinmm80@users.noreply.gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Reviewed-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Robert Marshall <rmarshall@gitlab.com>

.gitlab-ci.yml

@@ -42,7 +42,7 @@ variables:
   # To be used for images that exist only on dev.gitlab.org
   DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder'
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "4.9.1"
+  BUILDER_IMAGE_REVISION: "4.10.0"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"

gitlab-ci-config/check-packages.yml

@@ -133,11 +133,11 @@ Ubuntu-20.04-fips-check:
 CentOS-7-check:
   image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
   extends: .yum-install
-CentOS-8-check:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8:${BUILDER_IMAGE_REVISION}"
   extends: .yum-install
-CentOS-8-arm64-check:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_arm64:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-arm64-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_arm64:${BUILDER_IMAGE_REVISION}"
   extends: .yum-install
   tags:
   - docker-arm-builder
@@ -157,8 +157,8 @@ AmazonLinux-2022-arm64-check:
   extends: .yum-install
   tags:
   - docker-arm-builder
-CentOS-8-fips-check:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-fips-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   extends:
     - .yum-install
     - .ee-tag-only

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

@@ -318,11 +318,11 @@ Ubuntu-22.04-arm-branch:
 CentOS-7-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
-CentOS-8-branch:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
-CentOS-8-arm64-branch:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_arm64:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-arm64-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_arm64:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
   tags:
   - docker-arm-builder
@@ -369,8 +369,8 @@ SLES-15.2-branch:
 AmazonLinux-2-fips-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_branch_template
-CentOS-8-fips-branch:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-fips-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_branch_template
 Ubuntu-18.04-fips-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}"
@@ -458,7 +458,7 @@ RAT-Nightly:
 # This job runs only on nightly EE builds
 RAT-Nightly-FIPS:
   stage: slow_jobs
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   variables:
     USE_SYSTEM_SSL: "true"
     RAT_REFERENCE_ARCHITECTURE: "omnibus-gitlab-mrs-fips"
@@ -466,7 +466,7 @@ RAT-Nightly-FIPS:
     - bundle exec rake qa:rat:nightly
   cache: !reference [.branch-cache]
   needs:
-    - CentOS-8-fips-branch
+    - AlmaLinux-8-fips-branch
   allow_failure: true
   rules:
     - !reference [.default_rules, rules]
@@ -619,11 +619,11 @@ Ubuntu-22.04-arm:
 CentOS-7:
   image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
-CentOS-8:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
-CentOS-8-arm64:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_arm64:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-arm64:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_arm64:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
   tags:
   - docker-arm-builder
@@ -666,8 +666,8 @@ SLES-15.2:
 AmazonLinux-2-fips:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_tag_template
-CentOS-8-fips:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-fips:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_tag_template
 Ubuntu-18.04-fips:
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}"
@@ -746,19 +746,19 @@ CentOS-7-staging:
       optional: true
     - job: CentOS-7-branch
       optional: true
-CentOS-8-staging:
+AlmaLinux-8-staging:
   extends: .staging_upload_template
   needs:
-    - job: CentOS-8
+    - job: AlmaLinux-8
       optional: true
-    - job: CentOS-8-branch
+    - job: AlmaLinux-8-branch
       optional: true
-CentOS-8-arm64-staging:
+AlmaLinux-8-arm64-staging:
   extends: .staging_upload_template
   needs:
-    - job: CentOS-8-arm64
+    - job: AlmaLinux-8-arm64
       optional: true
-    - job: CentOS-8-arm64-branch
+    - job: AlmaLinux-8-arm64-branch
       optional: true
 OpenSUSE-15.4-staging:
   extends: .staging_upload_template
@@ -829,12 +829,12 @@ AmazonLinux-2-fips-staging:
       optional: true
     - job: AmazonLinux-2-fips-branch
       optional: true
-CentOS-8-fips-staging:
+AlmaLinux-8-fips-staging:
   extends: .fips_staging_upload_template
   needs:
-    - job: CentOS-8-fips
+    - job: AlmaLinux-8-fips
       optional: true
-    - job: CentOS-8-fips-branch
+    - job: AlmaLinux-8-fips-branch
       optional: true
 Ubuntu-18.04-fips-staging:
   extends: .fips_staging_upload_template
@@ -892,14 +892,14 @@ CentOS-7-release:
   extends: .production_release_template
   needs:
     - CentOS-7
-CentOS-8-release:
+AlmaLinux-8-release:
   extends: .production_release_template
   needs:
-    - CentOS-8
-CentOS-8-arm64-release:
+    - AlmaLinux-8
+AlmaLinux-8-arm64-release:
   extends: .production_release_template
   needs:
-    - CentOS-8-arm64
+    - AlmaLinux-8-arm64
 OpenSUSE-15.4-release:
   extends: .production_release_template
   needs:
@@ -946,10 +946,10 @@ AmazonLinux-2-fips-release:
   extends: .fips_release_template
   needs:
     - AmazonLinux-2-fips
-CentOS-8-fips-release:
+AlmaLinux-8-fips-release:
   extends: .fips_release_template
   needs:
-    - CentOS-8-fips
+    - AlmaLinux-8-fips
 Ubuntu-18.04-fips-release:
   extends: .fips_release_template
   needs:

gitlab-ci-config/gitlab-com.yml

@@ -392,7 +392,7 @@ danger-review:
     - if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
 Centos 7 knapsack: !reference [.knapsack]
-Centos 8 knapsack: !reference [.knapsack]
+AlmaLinux 8 knapsack: !reference [.knapsack]
 Debian 10 knapsack: !reference [.knapsack]
 Debian 11 knapsack: !reference [.knapsack]
 OpenSUSE 15.4 knapsack: !reference [.knapsack]
@@ -460,12 +460,12 @@ Centos 7 specs :
   parallel: 6
   needs:
   - Centos 7 knapsack
-Centos 8 specs :
-  image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/centos_8-ruby:${BUILDER_IMAGE_REVISION}"
+AlmaLinux 8 specs :
+  image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/almalinux_8-ruby:${BUILDER_IMAGE_REVISION}"
   extends: .chef_spec_template
   parallel: 6
   needs:
-  - Centos 8 knapsack
+  - AlmaLinux 8 knapsack
 OpenSUSE 15.4 specs :
   image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/opensuse_15.4-ruby:${BUILDER_IMAGE_REVISION}"
   extends: .chef_spec_template

lib/gitlab/ohai_helper.rb

@@ -38,6 +38,8 @@ class OhaiHelper
         verify_platform
       when 'centos'
         'el'
+      when 'almalinux'
+        'el'
       when 'opensuse', 'opensuseleap'
         'opensuse'
       when 'suse'
@@ -123,6 +125,8 @@ class OhaiHelper
         version = get_debian_version
       when 'centos'
         version = get_centos_version
+      when 'almalinux'
+        version = get_centos_version
       when 'opensuse', 'opensuseleap'
         version = get_opensuse_version
       when 'suse'