Merge pull request #139 from opscode/git-cache-test

git-cache updates for chef & chefdk

Gemfile.lock

@@ -1,33 +1,34 @@
 GIT
   remote: git://github.com/opscode/omnibus-ruby.git
-  revision: 1b962bea825270a9cd15aafa4b55a63577a586df
+  revision: d82057eb60488936f528c624f782ccf8b3e03b5e
   branch: master
   specs:
-    omnibus (2.0.1)
+    omnibus (3.0.0)
+      chef-sugar (~> 1.2)
       fpm (~> 1.0.0)
       mixlib-config (~> 2.1)
       mixlib-shellout (~> 1.3)
       ohai (~> 6.12)
-      rake
       thor (>= 0.16.0)
       uber-s3
 
 GIT
   remote: git://github.com/opscode/omnibus-software.git
-  revision: 9cedac41825d591f5d7aad55170d132f17baf6ed
+  revision: d40053dc5f3e180c2043d62b5b9a8e54c8fb0777
   branch: master
   specs:
     omnibus-software (0.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     arr-pm (0.0.9)
       cabin (> 0)
     backports (3.6.0)
     cabin (0.6.1)
-    childprocess (0.5.1)
+    chef-sugar (1.2.6)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
     clamp (0.6.3)
     ffi (1.9.3)
@@ -61,9 +62,8 @@ GEM
       mixlib-shellout
       systemu (~> 2.5.2)
       yajl-ruby
-    rake (10.1.1)
     systemu (2.5.2)
-    thor (0.18.1)
+    thor (0.19.1)
     uber-s3 (0.2.4)
       mime-types (~> 1.17)
     yajl-ruby (1.2.0)

config/projects/angrychef.rb

@@ -24,7 +24,7 @@
 
 replaces        "angrychef"
 install_path    "/opt/angrychef"
-build_version   Omnibus::BuildVersion.full
+build_version   Omnibus::BuildVersion.new.git_describe
 build_iteration 4
 
 dependency "preparation"

config/projects/chef-windows.rb

@@ -23,13 +23,10 @@
 #       Native gems will use gcc which will barf on files with spaces,
 #       which is only fixable if everyone in the world fixes their Makefiles
 install_path    "c:\\opscode\\chef"
-build_version   Omnibus::BuildVersion.full
+build_version   Omnibus::BuildVersion.new.git_describe
 build_iteration 4
 package_name    "chef-client"
 
 dependency "preparation"
-dependency "ruby-windows"
-dependency "libyaml-windows"
-dependency "ruby-windows-devkit"
 dependency "chef-windows"
 dependency "chef-client-msi"

config/projects/chef.rb

@@ -21,7 +21,7 @@
 
 replaces        "chef-full"
 install_path    "/opt/chef"
-build_version   Omnibus::BuildVersion.full
+build_version   Omnibus::BuildVersion.new.git_describe
 build_iteration 4
 mac_pkg_identifier "com.getchef.pkg.chef"
 

config/software/chef-windows.rb

@@ -18,6 +18,7 @@
 name "chef-windows"
 
 dependency "ruby-windows" #includes rubygems
+dependency "libyaml-windows"
 dependency "ruby-windows-devkit"
 dependency "bundler"
 dependency "cacerts"
@@ -85,16 +86,22 @@
     end
   end
 
-  # symlink required unix tools
-  # we need tar for 'knife cookbook site install' to function correctly
+  # Normally we would symlink the required unix tools.
+  # However with the introduction of git-cache to speed up omnibus builds,
+  # we can't do that anymore since git on windows doesn't support symlinks.
+  # https://groups.google.com/forum/#!topic/msysgit/arTTH5GmHRk
+  # Therefore we copy the tools to the necessary places.
+  # We need tar for 'knife cookbook site install' to function correctly
   {"tar.exe" => "bsdtar.exe",
     "libarchive-2.dll" => "libarchive-2.dll",
     "libexpat-1.dll" => "libexpat-1.dll",
     "liblzma-1.dll" => "liblzma-1.dll",
     "libbz2-2.dll" => "libbz2-2.dll",
     "libz-1.dll" => "libz-1.dll"
   }.each do |target, to|
-    command "mklink #{File.expand_path(File.join(install_dir, "bin", target)).gsub(/\//, "\\")} #{File.expand_path(File.join(install_dir, "embedded", "mingw", "bin", to)).gsub(/\//, "\\")}"
+    source = File.expand_path(File.join(install_dir, "embedded", "mingw", "bin", to)).gsub(/\//, "\\")
+    target = File.expand_path(File.join(install_dir, "bin", target)).gsub(/\//, "\\")
+    command "cp #{source}  #{target}"
   end
 
   rake "gem"

config/software/libyaml-windows.rb

@@ -25,7 +25,7 @@
 # of rubyinstaller.org
 #
 name "libyaml-windows"
-version "0.1.5"
+default_version "0.1.5"
 
 dependency "ruby-windows"
 

config/software/ruby-windows-devkit.rb

@@ -16,7 +16,7 @@
 #
 
 name "ruby-windows-devkit"
-version "4.5.2-20111229-1559"
+default_version "4.5.2-20111229-1559"
 
 dependency "ruby-windows"
 

config/software/ruby-windows.rb

@@ -16,7 +16,7 @@
 #
 
 name "ruby-windows"
-version "1.9.3-p484"
+default_version "1.9.3-p484"
 
 relative_path "ruby-#{version}-i386-mingw32"
 

jenkins/build

@@ -79,16 +79,16 @@ if [ "x$os" != "xAIX" ]; then
     dna=`pwd`/jenkins/dna.json
   fi
   # Omnibus build server prep tasks, including build ruby
-  # TEMPORARY: Temporarily disable chef-solo runs. 
-  # Can be reverted when https://github.com/opscode-cookbooks/omnibus/pull/12 
+  # TEMPORARY: Temporarily disable chef-solo runs.
+  # Can be reverted when https://github.com/opscode-cookbooks/omnibus/pull/12
   # is merged and released.
-  # Note that currently this functionality is not needed since we are far away 
+  # Note that currently this functionality is not needed since we are far away
   # from rebuilding slaves using cookbooks in ci.opscode.us.
   # sudo -i env PATH=$PATH chef-solo -c `pwd`/jenkins/solo.rb -j $dna -l debug
   # END of temporary change.
   # Fix root-owned perms left over from running chef-solo (cache turds, etc)
   set +e
-  sudo chown -R jenkins-node `pwd` || sudo chown -R jenkins `pwd` 
+  sudo chown -R jenkins-node `pwd` || sudo chown -R jenkins `pwd`
   set -e
 fi
 
@@ -122,6 +122,9 @@ sudo chown -R jenkins-node "/var/cache/omnibus" || sudo chown -R jenkins "/var/c
 
 # copy config into place
 cp omnibus.rb.example omnibus.rb
+# Temporarily disable dmg building in chef-client pipelines until dmg
+# is supported in omnitruck.
+echo "build_dmg false" >> omnibus.rb
 
 # Aaand.. new ruby
 PATH=/usr/local/bin:$PATH