diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | omnibus/.gitignore | 1 | ||||
-rw-r--r-- | omnibus/.kitchen.yml | 3 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 4 | ||||
-rw-r--r-- | omnibus/config/projects/chef-fips.rb | 3 | ||||
-rw-r--r-- | omnibus/config/projects/chef.rb | 15 | ||||
-rw-r--r-- | tasks/cbgb.rb | 96 |
7 files changed, 68 insertions, 56 deletions
diff --git a/.gitignore b/.gitignore index 064d998d6e..044899b03d 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,4 @@ kitchen-tests/nodes/* # Temporary files present during spec runs spec/data/test-dir -config/ +/config/ diff --git a/omnibus/.gitignore b/omnibus/.gitignore index d97af2ef9c..0425859582 100644 --- a/omnibus/.gitignore +++ b/omnibus/.gitignore @@ -8,4 +8,3 @@ cookbooks vendor/cookbooks build_timestamp ldd.out -jenkins/chef-solo diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml index 844ae9d895..7ca0af7f25 100644 --- a/omnibus/.kitchen.yml +++ b/omnibus/.kitchen.yml @@ -85,6 +85,9 @@ platforms: - name: windows-2008r2-standard driver: box: chef/windows-server-2008r2-standard # private + - name: windows-2012r2-standard + driver: + box: chef/windows-server-2012r2-standard # private attribute_defaults: &attribute_defaults build_user: vagrant diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 0f1423985e..8bdfdcdff1 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: git://github.com/chef/omnibus-software.git - revision: 56f4933c94cfcb85be7b3564ccab280769d90d12 + revision: 45fc26cf6b4692860bd44dc154c690e1e9265870 specs: omnibus-software (4.0.0) GIT remote: git://github.com/chef/omnibus.git - revision: d66b7fcafd5f8fb55e974913999fd1b9db564f1e + revision: 884a22a0d25edb9193947e411a0a9a4047e662d4 specs: omnibus (5.0.0) aws-sdk (~> 2) diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb index 37410b0e49..f9be9d3735 100644 --- a/omnibus/config/projects/chef-fips.rb +++ b/omnibus/config/projects/chef-fips.rb @@ -34,9 +34,10 @@ else install_dir "#{default_root}/#{name}" end +override :'ruby-windows', version: "2.0.0-p647" + # Global FIPS override flag. override :fips, enabled: true -override :'ruby-windows', version: "2.0.0-p647" override :chef, version: "local_source" override :ohai, version: "master" diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 1c9d647f16..6c436907d5 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -33,13 +33,16 @@ else end override :bundler, version: "1.10.6" -override :ruby, version: "2.1.6" -override :'ruby-windows', version: "2.0.0-p645" -# Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want -# to unnecessarily make the client any fatter. -if windows_arch_i386? - override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" +if windows? + override :'ruby-windows', version: "2.0.0-p645" + # Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want + # to unnecessarily make the client any fatter. + if windows_arch_i386? + override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" + end +else + override :ruby, version: "2.1.6" end ###### diff --git a/tasks/cbgb.rb b/tasks/cbgb.rb index 97d374e297..f128afbf1c 100644 --- a/tasks/cbgb.rb +++ b/tasks/cbgb.rb @@ -18,61 +18,67 @@ # require "rake" -require "tomlrb" CBGB_SOURCE = File.join(File.dirname(__FILE__), "..", "CBGB.toml") CBGB_TARGET = File.join(File.dirname(__FILE__), "..", "CBGB.md") -task :default => :generate +begin + require "tomlrb" -namespace :cbgb do - desc "Generate MarkDown version of CBGB file" - task :generate do - cbgb = Tomlrb.load_file CBGB_SOURCE - out = "<!-- This is a generated file. Please do not edit directly -->\n" - out << "<!-- Modify CBGB.toml file and run `rake cbgb:generate` to regenerate -->\n\n" - out << "# " + cbgb["Preamble"]["title"] + "\n\n" - out << cbgb["Preamble"]["text"] + "\n" - out << "# Board of Governors\n\n" - out << "## " + cbgb["Org"]["Lead"]["title"] + "\n\n" - out << person(cbgb["people"], cbgb["Org"]["Lead"]["person"]) + "\n\n" - out << "### " + cbgb["Org"]["Contributors"]["title"] + "\n\n" - out << cbgb(cbgb["people"], cbgb["Org"]["Contributors"]["governers"]) + "\n\n" - out << "### " + cbgb["Org"]["Corporate-Contributors"]["title"] + "\n\n" - out << cbgb(cbgb["corporations"], cbgb["Org"]["Corporate-Contributors"]["governers"]) + "\n\n" - out << "### " + cbgb["Org"]["Lieutenants"]["title"] + "\n\n" - out << cbgb(cbgb["people"], cbgb["Org"]["Lieutenants"]["governers"]) + "\n\n" - File.open(CBGB_TARGET, "w") { |fn| - fn.write out - } - end -end + task :default => :generate -def components(list, cmp) - out = "" - cmp.each do |k,v| - out << "\n#### #{v['title'].gsub('#','\\#')}\n" - out << cbgb(list, v["cbgb"]) + namespace :cbgb do + desc "Generate MarkDown version of CBGB file" + task :generate do + cbgb = Tomlrb.load_file CBGB_SOURCE + out = "<!-- This is a generated file. Please do not edit directly -->\n" + out << "<!-- Modify CBGB.toml file and run `rake cbgb:generate` to regenerate -->\n\n" + out << "# " + cbgb["Preamble"]["title"] + "\n\n" + out << cbgb["Preamble"]["text"] + "\n" + out << "# Board of Governors\n\n" + out << "## " + cbgb["Org"]["Lead"]["title"] + "\n\n" + out << person(cbgb["people"], cbgb["Org"]["Lead"]["person"]) + "\n\n" + out << "### " + cbgb["Org"]["Contributors"]["title"] + "\n\n" + out << cbgb(cbgb["people"], cbgb["Org"]["Contributors"]["governers"]) + "\n\n" + out << "### " + cbgb["Org"]["Corporate-Contributors"]["title"] + "\n\n" + out << cbgb(cbgb["corporations"], cbgb["Org"]["Corporate-Contributors"]["governers"]) + "\n\n" + out << "### " + cbgb["Org"]["Lieutenants"]["title"] + "\n\n" + out << cbgb(cbgb["people"], cbgb["Org"]["Lieutenants"]["governers"]) + "\n\n" + File.open(CBGB_TARGET, "w") { |fn| + fn.write out + } + end end - out -end -def cbgb(list, people) - o = "" - people.each do |p| - o << person(list, p) + "\n" + def components(list, cmp) + out = "" + cmp.each do |k,v| + out << "\n#### #{v['title'].gsub('#','\\#')}\n" + out << cbgb(list, v["cbgb"]) + end + out end - o -end -def person(list, person) - if list[person].has_key?("GitHub") - out = "* [#{list[person]["Name"]}](https://github.com/#{list[person]["GitHub"]})" - else - out = "* #{list[person]["Name"]}" + def cbgb(list, people) + o = "" + people.each do |p| + o << person(list, p) + "\n" + end + o end - if list[person].has_key?("Person") - out << " - #{list[person]["Person"]}" + + def person(list, person) + if list[person].has_key?("GitHub") + out = "* [#{list[person]["Name"]}](https://github.com/#{list[person]["GitHub"]})" + else + out = "* #{list[person]["Name"]}" + end + if list[person].has_key?("Person") + out << " - #{list[person]["Person"]}" + end + out end - out + +rescue LoadError + STDERR.puts "\n*** TomlRb not available.\n\n" end |