gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RAT_FIPS_PACKAGE_URL not having fips suffix in path 

While generating package information, specify fips argument for FIPS
package URLs. Also ensure the correct package folder is used in those
URLs.

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
This commit is contained in:
Balasankar 'Balu' C 2024-04-18 16:30:57 +05:30
parent fecc1240f3
commit 7eeb584a40
No known key found for this signature in database
GPG Key ID: B77D2E2E23735427
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/gitlab/build/info/ci.rb
View File

@ -56,13 +56,13 @@ module Build
# In EL world, amd64 is called x86_64
arch = 'x86_64' if arch == 'amd64'
folder = 'el-8'
package_file_name = "#{Info::Package.name}-#{Info::Package.release_version.gsub('+', '%2B')}.el8.#{arch}.rpm"
package_file_name = "#{Info::Package.name(fips: fips)}-#{Info::Package.release_version(fips: fips).gsub('+', '%2B')}.el8.#{arch}.rpm"
when /Ubuntu-20.04/
folder = 'ubuntu-focal'
package_file_name = "#{Info::Package.name}_#{Info::Package.release_version.gsub('+', '%2B')}_#{arch}.deb"
package_file_name = "#{Info::Package.name(fips: fips)}_#{Info::Package.release_version(fips: fips).gsub('+', '%2B')}_#{arch}.deb"
when /Ubuntu-22.04/
folder = 'ubuntu-jammy'
package_file_name = "#{Info::Package.name}_#{Info::Package.release_version.gsub('+', '%2B')}_#{arch}.deb"
package_file_name = "#{Info::Package.name(fips: fips)}_#{Info::Package.release_version(fips: fips).gsub('+', '%2B')}_#{arch}.deb"
end
if arch == 'arm64'
@ -70,7 +70,10 @@ module Build
folder = "#{folder}_aarch64"
end
job_name = "#{job_name}-fips" if fips
if fips
job_name = "#{job_name}-fips"
folder = "#{folder}_fips"
end
job_name = "#{job_name}-branch" unless Build::Info::CI.tag_name