Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make RPM packaging use threaded compression #1132

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make RPM packaging use threaded compression #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/omnibus/packagers/rpm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ def compression
else # default to gzip
"gzdio"
end
"w#{compression_level}.#{compression_name}"
"w#{compression_level}T.#{compression_name}"
end

#
Expand Down
10 changes: 5 additions & 5 deletions spec/unit/packagers/rpm_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ module Omnibus
expect(contents).to include("URL: https://example.com")
expect(contents).to include("Packager: Chef Software")
expect(contents).to include("Obsoletes: old-project")
expect(contents).to include("_binary_payload w9.gzdio")
expect(contents).to include("_binary_payload w9T.gzdio")
end

context "when RPM compression type xz is configured" do
Expand All @@ -226,7 +226,7 @@ module Omnibus
it "has the correct binary_payload line" do
subject.write_rpm_spec
contents = File.read(spec_file)
expect(contents).to include("_binary_payload w9.xzdio")
expect(contents).to include("_binary_payload w9T.xzdio")
end

context "when RPM compression level is also configured" do
Expand All @@ -237,7 +237,7 @@ module Omnibus
it "has the correct binary_payload line" do
subject.write_rpm_spec
contents = File.read(spec_file)
expect(contents).to include("_binary_payload w6.xzdio")
expect(contents).to include("_binary_payload w6T.xzdio")
end
end
end
Expand All @@ -250,7 +250,7 @@ module Omnibus
it "has the correct binary_payload line" do
subject.write_rpm_spec
contents = File.read(spec_file)
expect(contents).to include("_binary_payload w9.bzdio")
expect(contents).to include("_binary_payload w9T.bzdio")
end

context "when RPM compression level is also configured" do
Expand All @@ -261,7 +261,7 @@ module Omnibus
it "has the correct binary_payload line" do
subject.write_rpm_spec
contents = File.read(spec_file)
expect(contents).to include("_binary_payload w6.bzdio")
expect(contents).to include("_binary_payload w6T.bzdio")
end
end
end
Expand Down