From 0dd7331e2f71d09641242f508a0efcbf63efec7b Mon Sep 17 00:00:00 2001 From: Scott Hain Date: Wed, 4 Sep 2019 11:32:08 -0700 Subject: [PATCH 1/2] Add omnibus-gcc and fix up tests Signed-off-by: Scott Hain --- PRODUCT_MATRIX.md | 1 + lib/mixlib/install/product.rb | 20 +++++++++++++------- spec/functional/mixlib/install/cli_spec.rb | 16 ---------------- spec/unit/mixlib/install/product_spec.rb | 1 + 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/PRODUCT_MATRIX.md b/PRODUCT_MATRIX.md index 9ece533d..2c7a1ef2 100644 --- a/PRODUCT_MATRIX.md +++ b/PRODUCT_MATRIX.md @@ -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 | diff --git a/lib/mixlib/install/product.rb b/lib/mixlib/install/product.rb index 9483993b..e522c08b 100644 --- a/lib/mixlib/install/product.rb +++ b/lib/mixlib/install/product.rb @@ -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 @@ -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" @@ -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 @@ -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" @@ -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 @@ -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" @@ -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" @@ -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" diff --git a/spec/functional/mixlib/install/cli_spec.rb b/spec/functional/mixlib/install/cli_spec.rb index 03af2b05..d57910d2 100644 --- a/spec/functional/mixlib/install/cli_spec.rb +++ b/spec/functional/mixlib/install/cli_spec.rb @@ -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" } diff --git a/spec/unit/mixlib/install/product_spec.rb b/spec/unit/mixlib/install/product_spec.rb index 3894c3e8..50c9d602 100644 --- a/spec/unit/mixlib/install/product_spec.rb +++ b/spec/unit/mixlib/install/product_spec.rb @@ -150,6 +150,7 @@ manage marketplace omnibus-toolchain + omnibus-gcc private-chef push-jobs-client push-jobs-server From 044d9bb87f6c74c3093c2f87ab56373664f7ed1c Mon Sep 17 00:00:00 2001 From: Scott Hain Date: Wed, 4 Sep 2019 11:52:06 -0700 Subject: [PATCH 2/2] Add mac bootstrapper and fix specs Signed-off-by: Scott Hain --- PRODUCT_MATRIX.md | 1 + lib/mixlib/install/product.rb | 6 ++++++ spec/unit/mixlib/install/backend/package_router_spec.rb | 2 +- spec/unit/mixlib/install/product_spec.rb | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/PRODUCT_MATRIX.md b/PRODUCT_MATRIX.md index 2c7a1ef2..c57ed3dd 100644 --- a/PRODUCT_MATRIX.md +++ b/PRODUCT_MATRIX.md @@ -15,6 +15,7 @@ | Chef Infra Server High Availability addon | ha | | Harmony - Omnibus Integration Internal Test Project | harmony | | Chef InSpec | inspec | +| Habitat Mac Bootstrapper | mac-bootstrapper | | Management Console | manage | | Chef Cloud Marketplace addon | marketplace | | Omnibus GCC Package | omnibus-gcc | diff --git a/lib/mixlib/install/product.rb b/lib/mixlib/install/product.rb index e522c08b..535705d0 100644 --- a/lib/mixlib/install/product.rb +++ b/lib/mixlib/install/product.rb @@ -329,6 +329,12 @@ def products_available_on_downloads_site package_name "inspec" end + product "mac-bootstrapper" do + product_name "Habitat Mac Bootstrapper" + package_name "mac-bootstrapper" + downloads_product_page_url :not_available + end + product "manage" do product_name "Management Console" package_name do |v| diff --git a/spec/unit/mixlib/install/backend/package_router_spec.rb b/spec/unit/mixlib/install/backend/package_router_spec.rb index 27221582..f5cc4c50 100644 --- a/spec/unit/mixlib/install/backend/package_router_spec.rb +++ b/spec/unit/mixlib/install/backend/package_router_spec.rb @@ -111,7 +111,7 @@ end it "has the right product description" do - expect(artifact_info.product_description).to eq "Chef Client" + expect(artifact_info.product_description).to eq "Chef Infra Client" end it "has the right url" do diff --git a/spec/unit/mixlib/install/product_spec.rb b/spec/unit/mixlib/install/product_spec.rb index 50c9d602..2b71e4e6 100644 --- a/spec/unit/mixlib/install/product_spec.rb +++ b/spec/unit/mixlib/install/product_spec.rb @@ -147,6 +147,7 @@ ha harmony inspec + mac-bootstrapper manage marketplace omnibus-toolchain