diff --git a/config/software/ruby.rb b/config/software/ruby.rb index b1ef3e50a1a1822997b2da8af76fd849e05ddc76_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI=..699d4f2867299fef4338c050a15b3ab4101b978e_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI= 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -159,4 +159,7 @@ configure(*configure_command, env: env) make "-j #{workers}", env: env make "-j #{workers} install", env: env + + # Install OpenSSL gem for FIPS fixes + gem "install openssl --version '#{Gitlab::Util.get_env('OPENSSL_GEM_VERSION')}' --force --no-document" end diff --git a/gitlab-ci-config/check-packages.yml b/gitlab-ci-config/check-packages.yml index b1ef3e50a1a1822997b2da8af76fd849e05ddc76_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw=..699d4f2867299fef4338c050a15b3ab4101b978e_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw= 100644 --- a/gitlab-ci-config/check-packages.yml +++ b/gitlab-ci-config/check-packages.yml @@ -180,6 +180,13 @@ - .ee-tag-only variables: USE_SYSTEM_SSL: "true" +AlmaLinux-9-fips-check: + image: "${BUILDER_IMAGE_REGISTRY}/almalinux_9_fips:latest" + extends: + - .yum-install + - .ee-tag-only + variables: + USE_SYSTEM_SSL: "true" AmazonLinux-2-fips-check: image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:latest" extends: diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml index b1ef3e50a1a1822997b2da8af76fd849e05ddc76_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..699d4f2867299fef4338c050a15b3ab4101b978e_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644 --- a/gitlab-ci-config/dev-gitlab-org.yml +++ b/gitlab-ci-config/dev-gitlab-org.yml @@ -377,6 +377,9 @@ AlmaLinux-8-fips-branch: image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}" extends: .fips_branch_template +AlmaLinux-9-fips-branch: + image: "${BUILDER_IMAGE_REGISTRY}/almalinux_9_fips:${BUILDER_IMAGE_REVISION}" + extends: .fips_branch_template Ubuntu-20.04-fips-branch: image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:${BUILDER_IMAGE_REVISION}" extends: .fips_branch_template @@ -628,6 +631,9 @@ AlmaLinux-8-fips: image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}" extends: .fips_tag_template +AlmaLinux-9-fips: + image: "${BUILDER_IMAGE_REGISTRY}/almalinux_9_fips:${BUILDER_IMAGE_REVISION}" + extends: .fips_tag_template Ubuntu-20.04-fips: image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:${BUILDER_IMAGE_REVISION}" extends: .fips_tag_template @@ -826,6 +832,13 @@ optional: true - job: AlmaLinux-8-fips-branch optional: true +AlmaLinux-9-fips-staging: + extends: .fips_staging_upload_template + needs: + - job: AlmaLinux-9-fips + optional: true + - job: AlmaLinux-9-fips-branch + optional: true Ubuntu-20.04-fips-staging: extends: .fips_staging_upload_template needs: @@ -953,6 +966,10 @@ extends: .fips_release_template needs: - AlmaLinux-8-fips +AlmaLinux-9-fips-release: + extends: .fips_release_template + needs: + - AlmaLinux-9-fips Ubuntu-20.04-fips-release: extends: .fips_release_template needs: diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index b1ef3e50a1a1822997b2da8af76fd849e05ddc76_Z2l0bGFiLWNpLWNvbmZpZy92YXJpYWJsZXMueW1s..699d4f2867299fef4338c050a15b3ab4101b978e_Z2l0bGFiLWNpLWNvbmZpZy92YXJpYWJsZXMueW1s 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -42,3 +42,4 @@ QA_TESTS_REF: 'master' OPENSSL_VERSION: '1.1.1' FF_TIMESTAMPS: true + OPENSSL_GEM_VERSION: '~> 3.2.0'