From e11971aabe43164c161c18bc38c052a483a32922 Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 08:44:48 -0500 Subject: [PATCH 01/10] pinning versions of ohai and Berks items --- Berksfile | 10 +++++----- metadata.rb | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Berksfile b/Berksfile index a1cde03..e990655 100644 --- a/Berksfile +++ b/Berksfile @@ -8,11 +8,11 @@ cookbook 'dns', github: 'rightscale-cookbooks-contrib/dns', branch: 'rightscale_ #cookbook 'build-essential', '~> 2.2.4' cookbook 'database', github: 'rightscale-cookbooks-contrib/database', branch: 'rs-fixes' -cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup' -cookbook 'rightscale_volume',github: 'rightscale-cookbooks/rightscale_volume' -cookbook 'rightscale_tag',github: 'rightscale-cookbooks/rightscale_tag' -cookbook 'machine_tag',github: 'rightscale-cookbooks/machine_tag' -cookbook 'ephemeral_lvm',github:'rightscale-cookbooks/ephemeral_lvm' +cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup', branch: 'v1.2.0' +cookbook 'rightscale_volume',github: 'rightscale-cookbooks/rightscale_volume', branch: 'v1.3.0' +cookbook 'rightscale_tag',github: 'rightscale-cookbooks/rightscale_tag', branch: 'v1.1.0' +cookbook 'machine_tag',github: 'rightscale-cookbooks/machine_tag', branch: 'v1.1.0' +cookbook 'ephemeral_lvm',github:'rightscale-cookbooks/ephemeral_lvm', branch: 'v1.0.12' group :integration do cookbook 'runit', '1.6.0' diff --git a/metadata.rb b/metadata.rb index 72508cb..dea92b8 100644 --- a/metadata.rb +++ b/metadata.rb @@ -18,6 +18,7 @@ depends 'rightscale_backup', '~> 1.2.0' depends 'dns', '~> 0.1.3' depends 'git', '~> 4.0.2' +depends 'ohai', '~> 3.0.1' recipe 'rs-mysql::default', 'Sets up a standalone MySQL server' recipe 'rs-mysql::collectd', 'Sets up collectd monitoring for MySQL server' From 580bed09d365e1f4ff60637869cfc964a43f910a Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 09:41:42 -0500 Subject: [PATCH 02/10] pinning aws so it doesn't need ohai --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index dea92b8..2bcd9b0 100644 --- a/metadata.rb +++ b/metadata.rb @@ -18,7 +18,7 @@ depends 'rightscale_backup', '~> 1.2.0' depends 'dns', '~> 0.1.3' depends 'git', '~> 4.0.2' -depends 'ohai', '~> 3.0.1' +depends 'aws', '2.9.3' recipe 'rs-mysql::default', 'Sets up a standalone MySQL server' recipe 'rs-mysql::collectd', 'Sets up collectd monitoring for MySQL server' From bc080cffd148e3523d2b778043f37fe7d7c05cf4 Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 11:31:50 -0500 Subject: [PATCH 03/10] pinning ohai also --- metadata.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 2bcd9b0..c62f630 100644 --- a/metadata.rb +++ b/metadata.rb @@ -18,7 +18,8 @@ depends 'rightscale_backup', '~> 1.2.0' depends 'dns', '~> 0.1.3' depends 'git', '~> 4.0.2' -depends 'aws', '2.9.3' +depends 'aws', '~> 2.9.3' +depends 'ohai', '~> 2.1.0' recipe 'rs-mysql::default', 'Sets up a standalone MySQL server' recipe 'rs-mysql::collectd', 'Sets up collectd monitoring for MySQL server' From c1ccbdfe6f935c20c4ad9058d5d7b2470ecbbda2 Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 11:54:26 -0500 Subject: [PATCH 04/10] pinning ohai in Berksfile as well --- Berksfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Berksfile b/Berksfile index e990655..9536379 100644 --- a/Berksfile +++ b/Berksfile @@ -13,6 +13,7 @@ cookbook 'rightscale_volume',github: 'rightscale-cookbooks/rightscale_volume', b cookbook 'rightscale_tag',github: 'rightscale-cookbooks/rightscale_tag', branch: 'v1.1.0' cookbook 'machine_tag',github: 'rightscale-cookbooks/machine_tag', branch: 'v1.1.0' cookbook 'ephemeral_lvm',github:'rightscale-cookbooks/ephemeral_lvm', branch: 'v1.0.12' +cookbook 'ohai', '= 2.1.0' group :integration do cookbook 'runit', '1.6.0' From 2e5509809ea5a3a112aa06166a70934972901146 Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 12:11:20 -0500 Subject: [PATCH 05/10] cat Berkfile.lock --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e9fdff0..eff0b39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: ruby rvm: - 2.0.0 - 1.9.3 -before_script: bundle exec berks install +before_script: bundle exec berks install; cat Berkfile.lock script: bundle exec strainer test --except kitchen notifications: slack: From 4815802aaca32cf13f41cbebe90565170f6aaf8b Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 12:23:32 -0500 Subject: [PATCH 06/10] moving to berks list and adding debug --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eff0b39..6d732de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: ruby rvm: - 2.0.0 - 1.9.3 -before_script: bundle exec berks install; cat Berkfile.lock +before_script: bundle exec berks install -d; bundle exec berks list -d script: bundle exec strainer test --except kitchen notifications: slack: From 9e3f36de3d76c13a8e3d4a213e8d8ee2f87c05df Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 12:51:00 -0500 Subject: [PATCH 07/10] locking build-essential --- metadata.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata.rb b/metadata.rb index c62f630..44955bb 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,6 +20,7 @@ depends 'git', '~> 4.0.2' depends 'aws', '~> 2.9.3' depends 'ohai', '~> 2.1.0' +depends 'build-essential', '= 2.4.0' recipe 'rs-mysql::default', 'Sets up a standalone MySQL server' recipe 'rs-mysql::collectd', 'Sets up collectd monitoring for MySQL server' From bfd58e3974f68541709c46bc4929839aef616cc5 Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 13:07:09 -0500 Subject: [PATCH 08/10] pinning buildessential in berksfile --- Berksfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index 9536379..49c8cd1 100644 --- a/Berksfile +++ b/Berksfile @@ -5,7 +5,7 @@ metadata cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu' cookbook 'mysql', github: 'rightscale-cookbooks-contrib/mysql', branch: 'rs-fixes' cookbook 'dns', github: 'rightscale-cookbooks-contrib/dns', branch: 'rightscale_development_v2' -#cookbook 'build-essential', '~> 2.2.4' +cookbook 'build-essential', '~> 2.4.0' cookbook 'database', github: 'rightscale-cookbooks-contrib/database', branch: 'rs-fixes' cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup', branch: 'v1.2.0' From 94b284c2c7119d07c2da3f7c3cc8db02ac57d56c Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 13:15:43 -0500 Subject: [PATCH 09/10] adding cat, removing debug, testing gh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d732de..7dc5576 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: ruby rvm: - 2.0.0 - 1.9.3 -before_script: bundle exec berks install -d; bundle exec berks list -d +before_script: cat Berksfile; bundle exec berks install; bundle exec berks list -d script: bundle exec strainer test --except kitchen notifications: slack: From 9833f5c21619d5b9325ed2ceae804cc9170066ab Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Tue, 24 May 2016 13:21:59 -0500 Subject: [PATCH 10/10] adding old version of build-essential --- Berksfile | 2 +- metadata.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Berksfile b/Berksfile index 49c8cd1..597970e 100644 --- a/Berksfile +++ b/Berksfile @@ -5,7 +5,7 @@ metadata cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu' cookbook 'mysql', github: 'rightscale-cookbooks-contrib/mysql', branch: 'rs-fixes' cookbook 'dns', github: 'rightscale-cookbooks-contrib/dns', branch: 'rightscale_development_v2' -cookbook 'build-essential', '~> 2.4.0' +cookbook 'build-essential', '~> 1.4' cookbook 'database', github: 'rightscale-cookbooks-contrib/database', branch: 'rs-fixes' cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup', branch: 'v1.2.0' diff --git a/metadata.rb b/metadata.rb index 44955bb..359a34e 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,7 +20,7 @@ depends 'git', '~> 4.0.2' depends 'aws', '~> 2.9.3' depends 'ohai', '~> 2.1.0' -depends 'build-essential', '= 2.4.0' +depends 'build-essential', '~> 1.4' recipe 'rs-mysql::default', 'Sets up a standalone MySQL server' recipe 'rs-mysql::collectd', 'Sets up collectd monitoring for MySQL server'