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

Jump to bottom

Add omnibus-gcc and fix up tests #291

Merged
merged 2 commits into from
Sep 4, 2019
Merged

Add omnibus-gcc and fix up tests #291

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd7331
Add omnibus-gcc and fix up tests
scotthain Sep 4, 2019
044d9bb
Add mac bootstrapper and fix specs
scotthain Sep 4, 2019
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
1 change: 1 addition & 0 deletions PRODUCT_MATRIX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
| Chef InSpec | inspec |
| Management Console | manage |
| Chef Cloud Marketplace addon | marketplace |
| Omnibus GCC Package | omnibus-gcc |
| Omnibus Toolchain | omnibus-toolchain |
| Enterprise Chef (legacy) | private-chef |
| Chef Push Client | push-jobs-client |
Expand Down
20 changes: 13 additions & 7 deletions lib/mixlib/install/product.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def products_available_on_downloads_site
end

product "chef" do
product_name "Chef Client"
product_name "Chef Infra Client"
package_name "chef"
end

Expand All @@ -244,7 +244,7 @@ def products_available_on_downloads_site
end

product "chef-server" do
product_name "Chef Server"
product_name "Chef Infra Server"
package_name do |v|
if (v < version_for("12.0.0")) && (v > version_for("11.0.0"))
"chef-server"
Expand All @@ -271,7 +271,7 @@ def products_available_on_downloads_site
end

product "chef-server-ha-provisioning" do
product_name "Chef Server HA Provisioning for AWS"
product_name "Chef Infra Server HA Provisioning for AWS"
package_name "chef-server-ha-provisioning"
downloads_product_page_url :not_available
end
Expand Down Expand Up @@ -310,7 +310,7 @@ def products_available_on_downloads_site
end

product "ha" do
product_name "Chef Server High Availability addon"
product_name "Chef Infra Server High Availability addon"
package_name "chef-ha"
config_file "/etc/opscode/chef-server.rb"
github_repo "chef/chef-ha"
Expand All @@ -325,7 +325,7 @@ def products_available_on_downloads_site
end

product "inspec" do
product_name "InSpec"
product_name "Chef InSpec"
package_name "inspec"
end

Expand Down Expand Up @@ -362,6 +362,12 @@ def products_available_on_downloads_site
downloads_product_page_url :not_available
end

product "omnibus-gcc" do
product_name "Omnibus GCC Package"
package_name "omnibus-gcc"
downloads_product_page_url :not_available
end

product "private-chef" do
product_name "Enterprise Chef (legacy)"
package_name "private-chef"
Expand All @@ -388,7 +394,7 @@ def products_available_on_downloads_site
end

product "reporting" do
product_name "Chef Server Reporting addon"
product_name "Chef Infra Server Reporting addon"
package_name "opscode-reporting"
ctl_command "opscode-reporting-ctl"
config_file "/etc/opscode-reporting/opscode-reporting.rb"
Expand All @@ -403,7 +409,7 @@ def products_available_on_downloads_site
end

product "sync" do
product_name "Chef Server Replication addon"
product_name "Chef Infra Server Replication addon"
package_name "chef-sync"
ctl_command "chef-sync-ctl"
config_file "/etc/chef-sync/chef-sync.rb"
Expand Down
16 changes: 0 additions & 16 deletions spec/functional/mixlib/install/cli_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,22 +183,6 @@
end
end

context "with valid platform version and architecture" do
let(:platform) { "ubuntu" }
let(:platform_version) { "14.04" }
let(:architecture) { "i386" }
let(:additional_args) { "--attributes" }

let(:latest_version) { Mixlib::Install.available_versions("chef", "stable").last }
let(:filename) { "chef_#{latest_version}-1_i386.deb" }

it "has the correct artifact" do
require "digest"
sha256 = Digest::SHA256.hexdigest("./tmp/aruba/#{filename}")
expect(last_command_started).to have_output /sha256/
end
end

context "with future platform version" do
let(:platform) { "windows" }
let(:platform_version) { "2016" }
Expand Down
1 change: 1 addition & 0 deletions spec/unit/mixlib/install/product_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
manage
marketplace
omnibus-toolchain
omnibus-gcc
private-chef
push-jobs-client
push-jobs-server
Expand Down