Merge pull request #165 from opscode/sersut/omnibus-310

Chef CI Issues
chef-boneyard · May 19, 2014 · 64d0d2a · 64d0d2a
2 parents 59884c6 + f00665a
commit 64d0d2a
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,20 +1,20 @@
 GIT
   remote: git://github.com/opscode/omnibus-ruby.git
-  revision: 3dd6bd0fa797c4db0a068dd30a298ac0af595efd
+  revision: d7b6292193487a5b3b40fe045480e65e12863962
   branch: master
   specs:
-    omnibus (3.0.0)
+    omnibus (3.1.0)
       chef-sugar (~> 1.2)
       fpm (~> 1.0.0)
       mixlib-config (~> 2.1)
       mixlib-shellout (~> 1.3)
       ohai (~> 6.12)
-      thor (>= 0.16.0)
+      thor (~> 0.18)
       uber-s3
 
 GIT
   remote: git://github.com/opscode/omnibus-software.git
-  revision: f19539bc18fc0bfdbbcd4379dbfc60459dcdad77
+  revision: c65ec5e56714f19ac0f8a1b34fd5826b12bf7b33
   branch: master
   specs:
     omnibus-software (0.0.1)

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ $ bundle install --binstubs
 You create a platform-specific package using the `build project` command:
 
 ```shell
-$ bin/omnibus build project chef
+$ bin/omnibus build chef
 ```
 
 The platform/architecture type of the package created will match the platform
@@ -120,7 +120,7 @@ $ kitchen login ubuntu-12.04
 [vagrant@ubuntu...] $ cd omnbius-chef
 [vagrant@ubuntu...] $ bundle install --binstubs
 [vagrant@ubuntu...] $ ...
-[vagrant@ubuntu...] $ bundle exec omnibus build project <PROJECT NAME>
+[vagrant@ubuntu...] $ bundle exec omnibus build <PROJECT NAME>
 ```
 
 If you are building the Chef project you will need to purge the Chef package

diff --git a/Vagrantfile b/Vagrantfile
@@ -140,7 +140,7 @@ Vagrant.configure('2') do |config|
         sudo chown vagrant /opt/#{project_name}
         cd #{guest_project_path}
         bundle install --path=/home/vagrant/.bundler
-        bundle exec omnibus build project #{project_name}
+        bundle exec omnibus build #{project_name}
       OMNIBUS_BUILD
 
     end # config.vm.define.platform

diff --git a/config/projects/chefdk.rb b/config/projects/chefdk.rb
@@ -40,7 +40,6 @@
 override :libtool,   version: "2.4.2"
 override :libxml2,   version: "2.9.1"
 override :libxslt,   version: "1.1.28"
-override :nokogiri,  version: "1.6.1"
 override :ruby,      version: "2.1.1"
 override :rubygems,  version: "2.2.1"
 override :yajl,      version: "1.2.0"

diff --git a/files/chef/windows_msi/Resources/source.wxs b/files/chef/windows_msi/Resources/source.wxs
@@ -33,14 +33,29 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="WindowsVolume">
         <!-- Service needs chef directory to be present. -->
+        <Directory Id="CONFIGLOCATION" Name="chef">
+          <Component Id="CONFIGLOCATIONDIR" Guid="{F66F6394-51A4-4C5D-908B-E55584473436}" >
+            <CreateFolder Directory="CONFIGLOCATION" />
+          </Component>
+        </Directory>
         <Directory Id="INSTALLLOCATION" Name="opscode">
-          <Directory Id="PROJECTLOCATION" Name="chefdk" >
+          <Directory Id="PROJECTLOCATION" Name="chef" >
             <Directory Id="EMBEDDED" Name="embedded" >
               <Directory Id="EMBEDDEDBIN" Name="bin" >
-                <Component Id="ChefDkPath" Guid="{AEA5727E-DAD2-48CC-ADB8-38DD0EB46C62}" >
+                <Component Id="ChefClientPath" Guid="{7F663F88-55A2-4E20-82BF-8BD2E60BB83A}" >
                   <Environment Id="Environment"
                                Name="PATH" Action="set" Part="last" System="yes" Value="[PROJECTLOCATION]bin;[PROJECTLOCATION]embedded\bin" />
                 </Component>
+                <Component Id="ChefClientService" Guid="{69B2D8BE-4A47-4BE3-AEE8-83FAEB6E2FAF}" >
+                  <File Id="RubyExecutable" Source="$(var.ProjectSourceDir)\embedded\bin\ruby.exe" KeyPath="yes" />
+                  <ServiceInstall Name="chef-client" Type="ownProcess"
+                                  Start="auto" Vital="yes" ErrorControl="ignore"
+                                  Arguments="[PROJECTLOCATION]$(var.ChefGemPath)\lib\chef\application\windows_service.rb"
+                                  DisplayName="!(loc.ServiceDisplayName)"
+                                  Description="!(loc.ServiceDescription)" />
+                  <ServiceControl Id="ControlChefClientService" Name="chef-client"
+                                  Remove="both" Stop="both" Wait="yes" />
+                </Component>
               </Directory>
             </Directory>
           </Directory>
@@ -51,9 +66,23 @@
     <!-- Set the components defined in our fragment files that will be used for our feature  -->
     <Feature Id="ChefClientFeature" Title="!(loc.FeatureMainName)" Absent="disallow" AllowAdvertise="no" Level="1" ConfigurableDirectory="INSTALLLOCATION">
       <ComponentGroupRef Id="ProjectDir" />
-      <ComponentRef Id="ChefDkPath" />
+      <ComponentRef Id="ChefClientPath" />
+      <ComponentRef Id="CONFIGLOCATIONDIR" />
     </Feature>
 
+    <Feature Id="ChefServiceFeature" Title="!(loc.FeatureServiceName)" Level="1000" AllowAdvertise="no">
+      <ComponentRef Id="ChefClientService" />
+    </Feature>
+
+    <!--
+      TODO:
+
+      * create Chef home directory? ie C:\chef
+      * create initial Client config? ie C:\chef\client.rb?
+      * optionally install extra tools?  ie git?
+
+    -->
+
     <!--
       UI Stuff
     -->
@@ -62,8 +91,8 @@
     <Property Id="ARPHELPLINK" Value="http://www.getchef.com/support/" />
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
 
-    <UIRef Id="ChefDkUI_InstallDir"/>
-    <UI Id="ChefDkUI_InstallDir">
+    <UIRef Id="ChefClientUI_InstallDir"/>
+    <UI Id="ChefClientUI_InstallDir">
       <UIRef Id="WixUI_FeatureTree"/>
       <TextStyle Id="WixUI_Font_Normal_White" FaceName="Tahoma" Size="8" Red="255" Green="255" Blue="255" />
       <TextStyle Id="WixUI_Font_Bigger_White" FaceName="Tahoma" Size="12" Red="255" Green="255" Blue="255" />

diff --git a/jenkins/build b/jenkins/build
@@ -149,9 +149,9 @@ fi
 bundle install --without docs
 
 if [ "$RELEASE_BUILD" = "true" ]; then
-  bundle exec omnibus build project $OMNIBUS_PROJECT_NAME --no-timestamp
+  bundle exec omnibus build $OMNIBUS_PROJECT_NAME -l debug --no-timestamp
 else
-  bundle exec omnibus build project $OMNIBUS_PROJECT_NAME
+  bundle exec omnibus build $OMNIBUS_PROJECT_NAME -l debug
 fi
 
 # Sign the package on some platforms:

diff --git a/jenkins/build.bat b/jenkins/build.bat
@@ -41,7 +41,7 @@ rem # ensure the installed certificate authority is loaded
 set SSL_CERT_FILE=C:\Ruby193\ssl\certs\cacert.pem
 call bundle install || GOTO :error
 
-call bundle exec omnibus build project %OMNIBUS_PROJECT_NAME%-windows || GOTO :error
+call bundle exec omnibus build %OMNIBUS_PROJECT_NAME%-windows -l debug || GOTO :error
 
 GOTO :EOF