Skip to content
Snippets Groups Projects
Commit e01a9a5c8c6a authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Install OpenSSL gem after Ruby

For FIPS packages for OSs that ship OpenSSL 3+ to work properly, the
changes made as part of https://github.com/ruby/openssl/issues/603

 is
required. This is available in v3.2.0 of the OpenSSL gem. Installing it
after installing Ruby will cause Ruby to use it instead of the default
OpenSSL gem version.

Signed-off-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
parent de531a50acef
1 merge request!161Merge upstream Omnibus GitLab into Omnibus Heptapod
...@@ -159,4 +159,7 @@ ...@@ -159,4 +159,7 @@
configure(*configure_command, env: env) configure(*configure_command, env: env)
make "-j #{workers}", env: env make "-j #{workers}", env: env
make "-j #{workers} install", 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 end
...@@ -180,6 +180,13 @@ ...@@ -180,6 +180,13 @@
- .ee-tag-only - .ee-tag-only
variables: variables:
USE_SYSTEM_SSL: "true" 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: AmazonLinux-2-fips-check:
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:latest" image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:latest"
extends: extends:
......
...@@ -377,6 +377,9 @@ ...@@ -377,6 +377,9 @@
AlmaLinux-8-fips-branch: AlmaLinux-8-fips-branch:
image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}" image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
extends: .fips_branch_template 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: Ubuntu-20.04-fips-branch:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:${BUILDER_IMAGE_REVISION}" image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:${BUILDER_IMAGE_REVISION}"
extends: .fips_branch_template extends: .fips_branch_template
...@@ -628,6 +631,9 @@ ...@@ -628,6 +631,9 @@
AlmaLinux-8-fips: AlmaLinux-8-fips:
image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}" image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
extends: .fips_tag_template 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: Ubuntu-20.04-fips:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:${BUILDER_IMAGE_REVISION}" image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:${BUILDER_IMAGE_REVISION}"
extends: .fips_tag_template extends: .fips_tag_template
...@@ -826,6 +832,13 @@ ...@@ -826,6 +832,13 @@
optional: true optional: true
- job: AlmaLinux-8-fips-branch - job: AlmaLinux-8-fips-branch
optional: true 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: Ubuntu-20.04-fips-staging:
extends: .fips_staging_upload_template extends: .fips_staging_upload_template
needs: needs:
...@@ -953,6 +966,10 @@ ...@@ -953,6 +966,10 @@
extends: .fips_release_template extends: .fips_release_template
needs: needs:
- AlmaLinux-8-fips - AlmaLinux-8-fips
AlmaLinux-9-fips-release:
extends: .fips_release_template
needs:
- AlmaLinux-9-fips
Ubuntu-20.04-fips-release: Ubuntu-20.04-fips-release:
extends: .fips_release_template extends: .fips_release_template
needs: needs:
......
...@@ -42,3 +42,4 @@ ...@@ -42,3 +42,4 @@
QA_TESTS_REF: 'master' QA_TESTS_REF: 'master'
OPENSSL_VERSION: '1.1.1' OPENSSL_VERSION: '1.1.1'
FF_TIMESTAMPS: true FF_TIMESTAMPS: true
OPENSSL_GEM_VERSION: '~> 3.2.0'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment