engineyard-hudson 0.2.0 → 0.2.1

data/README.md

@@ -4,7 +4,7 @@ Run your continuous integration (CI) tests against your Engine Yard AppCloud env
 
 You're developing on OS X or Windows, deploying to Engine Yard AppCloud (Gentoo/Linux), and you're running your CI on your local machine or a spare Ubuntu machine in the corner of the office, or ... you're not running CI at all?
 
-It's a nightmare. It was for me. [Hudson CI](http://hudson-ci.org/), `engineyard-hudson` and the [hudson](http://github.com/cowboyd/hudson.rb) CLI projects now make CI easier to do than not to. A few commands and your Rails applications' tests are automatically running, no additional setup, and its the same environment you are deploying your Rails applications (Engine Yard AppCloud). Sweet.
+It's a nightmare. It was for me. [Hudson CI](http://hudson-ci.org/), the [hudson](http://github.com/cowboyd/hudson.rb) CLI project, and **engineyard-hudson** now make CI easier to do than not to. A few quick commands and your Rails applications' tests are automatically running, no additional setup, and its the same environment you are deploying your Rails applications (Engine Yard AppCloud). Sweet.
 
 ## Installation
 
@@ -24,9 +24,8 @@ You **do not** need to be familiar with custom chef recipes. Just follow the sim
 
 In the very first release of `engineyard-hudson`:
 
-* there is no support for authentication/authorization of Hudson CI.
-* git URLs are converted to public `git://` urls on Hudson; until deploy key support is added
-* no mail server configured for Hudson CI build failure notifications
+* There is no support for authentication/authorization of Hudson CI. It _will_ use the deploy keys already installed on your AppCloud instance, as described in engineyard-serverside [#set_up_git_ssh](http://github.com/engineyard/engineyard-serverside/blob/master/lib/engineyard-serverside/strategies/git.rb#L106-134)
+* No mail server configured for Hudson CI build failure notifications.
 
 That is, its really only useful - at this very "alpha" instant in time - to Open Source Rails projects. But that's just me being brutally honest.
 
@@ -50,6 +49,8 @@ Just a few steps and you will have your own Hudson CI:
 
 Do those steps and you're done! Now, you either visit your Hudson CI site or use `hudson list` to see the status of your projects being tested.
 
+Note: the Hudson CI environment in Engine Yard AppCloud must be a single instance "solo".
+
 ### Hosting elsewhere
 
 You need the following information about your Hudson CI:
@@ -60,6 +61,8 @@ You need the following information about your Hudson CI:
 
 ## Running your tests in Hudson against Engine Yard AppCloud
 
+This is the exciting part - ensuring that your CI tests are being run in the same environment as your production applications. In this case, on Engine Yard AppCloud.
+
 Just a few steps and you will have your applications' tests running.
 
     $ cd /my/project
@@ -73,6 +76,54 @@ Just a few steps and you will have your applications' tests running.
 
 Do those steps and you're done! Now, you either visit your Hudson CI site or use `hudson list` to see the status of your projects being tested.
 
+### Conventions/Requirements
+
+* Do not use your production environment as your Hudson CI slave. There are no guarantees what will happen. I expect bad things.
+* You must name your CI environment with a suffix of `_ci` or `_hudson_slave`.
+* You should not name any other environments with a suffix of `_ci` or `_hudson_slave`; lest they offer themselves to your Hudson CI as slave nodes.
+* Keep your production and CI environments exactly the same. Use the same Ruby implementation/version, same database, and include the same RubyGems and Unix packages. Why? This is the entire point of the exercise: to run your CI tests in the same environment as your production application runs.
+
+For example, note the naming convention of the two CI environments below (one ends in `_hudson_slave` and the other `_ci`).
+
+<img src="http://img.skitch.com/20101031-dxnk7hbn32yce9rum1ctwjwt1w.png" style="width: 100%">
+
+### What happens?
+
+When you boot your Engine Yard AppCloud CI environments, each resulting EC2 instance executes a special "hudson_slave" recipe (see `cookbooks/hudson_slave/recipes/default.rb` in your project). This does three things:
+
+* Adds this instance to your Hudson CI server as a slave
+* Adds each Rails/Rack application for the AppCloud environment into your Hudson CI as a "job".
+* Commences the first build of any newly added job.
+
+If your CI instances have already been booted and you re-apply the recipes over and over (`ey recipes apply`), nothing good or bad will happen. The instances will stay registered as slaves and the applications will stay registered as Hudson CI jobs.
+
+If a new application is on the instance, then a new job will be created on Hudson CI.
+
+To delete a job from Hudson CI, you should also delete it from your AppCloud CI environment to ensure it isn't re-added the next time you re-apply or re-build or terminate/boot your CI environment. (To delete a job, use the Hudson CI UI or `hudson remove APP-NAME` from the CLI.)
+
+In essence, to add new Rails/Rack applications into your Hudson CI server you:
+
+* Add them to one of your Engine Yard AppCloud CI environments (the one that matches the production environment where the application will be hosted)
+* Rebuild the environment or re-apply the custom recipes (`ey recipes apply`)
+
+### Applications are run in their respective CI environment
+
+Thusly demonstrated below: the application/job "ci_demo_app" is in the middle of a build on its target slave "ci_demo_app_ci". See the AppCloud UI example above to see the relationship between the application/job names and the environment/slave names.
+
+<img src="http://img.skitch.com/20101031-tga2f23wems1acpad1ua41qdmb.png" style="width: 100%">
+
+### Can I add applications/jobs to Hudson CI other ways?
+
+Yes. There are three simple ways to get Hudson CI to run tests for your application ("create a job to run builds"). Above is the first: all "applications" on the Engine Yard AppCloud CI environment will automatically become Hudson CI jobs. The alternates are:
+
+* Use the `hudson create .` command from the [hudson](http://github.com/cowboyd/hudson.rb) CLI. 
+
+Pass the `--assigned_node xyz` flag to make the project's test be executed on a specific slave node. "xyz" is the name of another application on your AppCloud account; your tests will be executed on the same instance, with the same version of Ruby etc.
+
+* Use the Hudson CI UI to create a new job. As above, you can make sure the tests are run on a specific Engine Yard AppCloud instance by setting the assigned node label to be the same as another AppCloud application in your account that is being tested.
+
+Specifically, Hudson CI uses "labels" to match jobs to slaves. A common example usage is to label a Windows slave as "windows". A job could then be restricted to only running on slaves with label "windows". We are using this same mechanism.
+
 ## Automatically triggering job builds
 
 In Hudson CI, a "job" is one of your projects. Each time it runs your tests, it is called a "build".
@@ -97,7 +148,7 @@ You can also use the "Test Hook" link to test this is wired up correctly.
 
 Using the `hudson` CLI:
 
-    hudson build APP-NAME
+    hudson build path/to/APP-NAME
 
 ### Curl
 
@@ -107,8 +158,8 @@ You are triggering the build via a GET call to an URL endpoint. So you can also
 
 ## Contributions
 
-* Dr Nic Williams
-* Bo Jeanes - initial chef recipes for Hudson server + slave
+* Dr Nic Williams ([drnic](http://github.com/drnic))
+* Bodaniel Jeanes ([bjeanes](http://github.com/bjeanes)) - initial chef recipes for [Hudson server + slave](http://github.com/bjeanes/ey-cloud-recipes)
 
 ## License
 

data/engineyard-hudson.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "engineyard-hudson"
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Dr Nic Williams"]
   s.email       = ["drnicwilliams@gmail.com"]

data/features/server.feature

@@ -6,7 +6,7 @@ Feature: Managing ey hudson server
     When I run local executable "ey-hudson" with arguments "server ."
     Then file "cookbooks/main/recipes/default.rb" is created
     And file "cookbooks/hudson_master/recipes/default.rb" is created
-    And file "cookbooks/hudson_master/attributes/default.rb" contains ":plugins => %w[git github rake ruby greenballs]"
+    And file "cookbooks/hudson_master/attributes/default.rb" contains ":plugins => %w[git github rake ruby greenballs envfile]"
     And I should see exactly
       """
             create  cookbooks
@@ -33,7 +33,7 @@ Feature: Managing ey hudson server
     When I run local executable "ey-hudson" with arguments "server . -p ' chucknorris , googleanalytics '"
     Then file "cookbooks/main/recipes/default.rb" is created
     And file "cookbooks/hudson_master/recipes/default.rb" is created
-    And file "cookbooks/hudson_master/attributes/default.rb" contains ":plugins => %w[git github rake ruby greenballs chucknorris googleanalytics]"
+    And file "cookbooks/hudson_master/attributes/default.rb" contains ":plugins => %w[git github rake ruby greenballs envfile chucknorris googleanalytics]"
   
   
   

data/lib/engineyard-hudson/cli.rb

@@ -5,13 +5,6 @@ module Engineyard
   module Hudson
     class CLI < Thor
 
-      def self.common_options
-        method_option :environment, :type => :string, :aliases => %w(-e), 
-          :desc => "Environment in which to deploy this application", :required => true
-        method_option :account, :type => :string, :aliases => %w(-c), 
-          :desc => "Name of the account you want to deploy in"
-      end
-      
       desc "install PROJECT_PATH", "Install Hudson node/slave recipes into your project."
       def install(project_path)
         require 'engineyard-hudson/cli/install'
@@ -26,6 +19,7 @@ module Engineyard
       
       desc "version", "show version information"
       def version
+        require 'engineyard-hudson/version'
         shell.say Engineyard::Hudson::VERSION
       end
 

data/lib/engineyard-hudson/cli/install/templates/attributes.rb.tt

@@ -8,10 +8,10 @@ hudson_slave({
     :host => "ec2-174-129-24-134.compute-1.amazonaws.com",
     :port => 80,
     :public_key => "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6AWDDDJcsIrY0KA99KPg+UmSjxjPz7+Eu9mO5GaSNn0vvVdsgrgjkh+35AS9k8Gn/DPaQJoNih+DpY5ZHsuY1zlvnvvk+hsCUHOATngARNs6yQMf2IrQqf38SlBPJ/xjt4oopLyqZuZ59xbFMFa0Yr/B7cCpxNpeIMCbwmc8YOtztOG1ZazlxB6eMTwp1V25TxFPh3PqUz9s37NmBEhkRiEyiJzlDSrKwz2y+77VWztQByM30lYAEXc5GwJD1LTaQwlv/thjhwveAzKLIpxzC5TbUjii7L+4iJF/JrjtXAEYmkegXj6lGBpRIdwXTYWMm3jG6gG+MV2nfWmocDzg3Q==",
-    :master_key_location => "/home/hudson/.ssh/id_rsa"
+    :master_key_location => "/home/deploy/.ssh/id_rsa"
   },
   :gem => {
     :install => "hudson --pre",
-    :version => "hudson-0.3.0.beta.13"
+    :version => "hudson-0.3.0.beta.16"
   }
 })

data/lib/engineyard-hudson/cli/install/templates/recipes.rb

@@ -3,15 +3,14 @@
 # Recipe:: default
 #
 
-env_name = node[:environment][:name]
-username = node[:users].first[:username]
+env_name      = node[:environment][:name]
+framework_env = node[:environment][:framework_env]
+username      = node[:users].first[:username]
 
-if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /_(ci|hudson_slave)$/
-  # gem_package "hudson" do
-  #   source "http://gemcutter.org"
-  #   version "0.3.0.beta.3"
-  #   action :install
-  # end
+if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /(ci|hudson_slave)$/
+  gem_package "bundler" do
+    action :install
+  end
 
   execute "install_hudson_in_resin" do
     command "/usr/local/ey_resin/ruby/bin/gem install #{node[:hudson_slave][:gem][:install]}"
@@ -41,6 +40,8 @@ if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /_(ci|hud
 
       Hudson::Api.setup_base_url(node[:hudson_slave][:master])
       
+      Hudson::Api.delete_node(env_name)
+      
       # Tell master about this slave
       Hudson::Api.add_node(
         :name        => env_name,
@@ -57,7 +58,7 @@ if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /_(ci|hud
   ruby_block "tell-master-about-new-jobs" do
     block do
       begin
-        job_names   = Hudson::Api.summary["jobs"].map {|job| job["name"]} # TODO Hudson::Api.job_names
+        job_names   = Hudson::Api.job_names
         app_names   = node[:applications].keys
         apps_to_add = app_names - job_names
 
@@ -65,9 +66,20 @@ if ['solo','app_master'].include?(node[:instance_role]) && env_name =~ /_(ci|hud
         apps_to_add.each do |app_name|
           data = node[:applications][app_name]
 
-          job_config = Hudson::JobConfigBuilder.new("rails") do |c|
+          # job_config = Hudson::JobConfigBuilder.new("rails") do |c|
+          job_config = Hudson::JobConfigBuilder.new do |c|
             c.scm           = data[:repository_name]
             c.assigned_node = app_name
+            c.envfile       = "/data/#{app_name}/shared/config/git-env"
+            c.steps         = [
+              [:build_shell_step, "bundle install"],
+              [:build_ruby_step, <<-RUBY.gsub(/^            /, '')],
+                appcloud_database = "/data/#{app_name}/shared/config/database.yml"
+                FileUtils.cp appcloud_database, "config/database.yml"
+                RUBY
+              [:build_shell_step, "bundle exec rake db:schema:load RAILS_ENV=#{framework_env} RACK_ENV=#{framework_env}"],
+              [:build_shell_step, "bundle exec rake RAILS_ENV=#{framework_env} RACK_ENV=#{framework_env}"]
+            ]
           end
         
           Hudson::Api.create_job(app_name, job_config)

data/lib/engineyard-hudson/cli/server.rb

@@ -18,7 +18,7 @@ module Engineyard
       end
       
       def attributes
-        @plugins = %w[git github rake ruby greenballs] + (options[:plugins] || '').strip.split(/\s*,\s*/)
+        @plugins = %w[git github rake ruby greenballs envfile] + (options[:plugins] || '').strip.split(/\s*,\s*/)
         template "attributes.rb.tt", "cookbooks/hudson_master/attributes/default.rb"
       end
       

data/lib/engineyard-hudson/version.rb

@@ -0,0 +1,5 @@
+module Engineyard
+  module Hudson
+    VERSION = '0.2.1'
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-hudson
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -07:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,6 +179,7 @@ files:
 - lib/engineyard-hudson/cli/server/templates/cookbooks/main/libraries/run_for_app.rb
 - lib/engineyard-hudson/cli/server/templates/cookbooks/main/recipes/default.rb
 - lib/engineyard-hudson/thor-ext/actions/directory.rb
+- lib/engineyard-hudson/version.rb
 has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-hudson
 licenses: []