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

Merge branch '8490-fix-rat-fips-package-url' into 'master' 

Fix RAT_FIPS_PACKAGE_URL not having fips suffix in path

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8490

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
This commit is contained in:
Robert Marshall 2024-04-19 17:25:00 +00:00
parent 8264314f7d 7eeb584a40
commit 4334402cad
2 changed files with 13 additions and 10 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

12
lib/gitlab/build/info/package.rb
View File

@ -10,8 +10,8 @@ module Build
PACKAGE_GLOB = "pkg/**/*.{deb,rpm}".freeze
class << self
def name
return "gitlab-fips" if Check.use_system_ssl?
def name(fips: Check.use_system_ssl?)
return "gitlab-fips" if fips
return "gitlab-ee" if Check.is_ee?
"gitlab-ce"
@ -32,7 +32,7 @@ module Build
# package version will remain the same but contents of the package will be
# different.
# To resolve this, we append a PIPELINE_ID to change the name of the package
def semver_version
def semver_version(fips: Build::Check.use_system_ssl?)
if Build::Check.on_tag?
# timestamp is disabled in omnibus configuration
Omnibus.load_configuration('omnibus.rb')
@ -42,13 +42,13 @@ module Build
latest_version = latest_git_tag && !latest_git_tag.empty? ? latest_git_tag[0, latest_git_tag.match("[+]").begin(0)] : '0.0.1'
commit_sha = Build::Info::Git.commit_sha
ver_tag = "#{latest_version}+" + (Build::Check.is_nightly? ? "rnightly" : "rfbranch")
ver_tag += ".fips" if Build::Check.use_system_ssl?
ver_tag += ".fips" if fips
[ver_tag, Gitlab::Util.get_env('CI_PIPELINE_ID'), commit_sha].compact.join('.')
end
end
def release_version
semver = Info::Package.semver_version
def release_version(fips: Build::Check.use_system_ssl?)
semver = Info::Package.semver_version(fips: fips)
"#{semver}-#{Gitlab::BuildIteration.new.build_iteration}"
end