bosh-cloudfoundry 0.4.1 → 0.5.0

data/.rspec

@@ -1,2 +1,3 @@
 --format progress
 --color
+--profile

data/ChangeLog.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## v0.5
+
+Gerrit is dead. Long live gerrit. This release is for everyone who is getting started or wants to upgrade. Gerrit is dead.
+
+A few days ago the core Cloud Foundry team shut down the gerrit hosting of cf-release and several patches that we needed to run Cloud Foundry on AWS and/or OpenStack. Fortunately, all the patches have been merged into the staging branch of the cf-release on github. This new release of bosh-cloudfoundry defaults to creating a development (non-final) release of cf-release from its staging branch.
+
+The `bosh cf upload release` command now has a `--branch BRANCH` for uploading a release based on a different branch. It currently defaults to `staging`.
+
+In future, when cf-release eventually merges all the required patches into master branch, we will switch to defaulting to `master`.
+
+And finally, the big requirement for going v1.0, is for all the required patches to be included in a final release of cf-release.
+
 ## v0.4
 
 Defaults to patched dev release (since a cf-release final release doesn't work).

data/README.md

@@ -33,7 +33,8 @@ bosh cf prepare system production
 # the re-run:
 bosh cf prepare system production
 
-bosh deploy
+# use special "cf deploy" to install VMC & create initial VMC user
+bosh cf deploy
 
 # now we can grow our single VM deployment
 

data/lib/bosh-cloudfoundry/bosh_release_manager.rb

@@ -74,7 +74,8 @@ module Bosh::CloudFoundry::BoshReleaseManager
     File.join(cf_release_dir, "#{release_name}-#{dev_release_number}.yml")
   end
 
-  def create_and_upload_dev_release(release_name=default_dev_release_name)
+  def create_and_upload_dev_release
+    release_name = default_dev_release_name
     chdir(cf_release_dir) do
       write_dev_config_file(release_name)
       sh "bosh -n --color create release --with-tarball --force"
@@ -94,22 +95,29 @@ module Bosh::CloudFoundry::BoshReleaseManager
     File.open(dev_config_file, "w") { |file| file << dev_config.to_yaml }
   end
 
-  # assume unchanged config/final.yml
+  # clones or updates cf-release for a specific branch
+  # For all defaults, clones into:
+  # * /var/vcap/store/releases/cf-release/master (cf_release_branch_dir)
+  #
+  # Uses:
+  # * releases_dir (e.g. '/var/vcap/store/releases')
+  # * cf_release_branch (e.g. 'staging')
+  # * cf_release_branch_dir (e.g. '/var/vcap/store/releases/cf-release/staging')
   def clone_or_update_cf_release
-    cf_release_dirname = File.basename(cf_release_dir)
-    if File.directory?(cf_release_dir)
-      chdir(cf_release_dir) do
-        sh "git pull origin master"
+    raise "invoke #set_cf_release_branch(branch) first" unless cf_release_branch_dir
+    if File.directory?(cf_release_branch_dir)
+      chdir(cf_release_branch_dir) do
+        sh "git pull origin #{cf_release_branch} --no-recurse-submodules" # recursive is below
       end
     else
       chdir(releases_dir) do
-        sh "git clone #{cf_release_git_repo} #{cf_release_dirname}"
-        chdir(cf_release_dirname) do
+        sh "git clone #{cf_release_git_repo} #{cf_release_branch_dir}"
+        chdir(cf_release_branch_dir) do
           sh "git update-index --assume-unchanged config/final.yml 2>/dev/null"
         end
       end
     end
-    chdir(cf_release_dir) do
+    chdir(cf_release_branch_dir) do
       say "Rewriting all git:// & git@ to https:// ..."
       # Snippet written by Mike Reeves <swampfoxmr@gmail.com> on bosh-users mailing list
       # Date 2012-12-06
@@ -123,12 +131,13 @@ module Bosh::CloudFoundry::BoshReleaseManager
     "appcloud"
   end
 
-  def default_dev_release_name
-    default_release_name + "-dev"
+  def default_dev_release_name(branch_name=cf_release_branch)
+    suffix = "-#{branch_name || 'dev'}"
+    default_release_name + suffix
   end
 
   def switch_to_development_release
-    system_config.release_name = default_dev_release_name
+    system_config.release_name = default_dev_release_name(cf_release_branch)
     system_config.release_version = "latest"
     system_config.save
   end
@@ -138,4 +147,4 @@ module Bosh::CloudFoundry::BoshReleaseManager
     system_config.release_version = "latest"
     system_config.save
   end
-end
+end

data/lib/bosh-cloudfoundry/config/common_config.rb

@@ -10,10 +10,8 @@ module Bosh::CloudFoundry::Config
     [
       :base_systems_dir, # e.g. /var/vcap/store/systems
       :target_system,        # e.g. /var/vcap/store/systems/production
-      :cf_release_git_repo, # e.g. "git://github.com/cloudfoundry/cf-release.git"
       :bosh_git_repo,    # e.g. "git://github.com/cloudfoundry/bosh.git"
       :releases_dir,     # e.g. /var/vcap/store/releases
-      :cf_release_dir,   # e.g. /var/vcap/store/releases/cf-release
       :stemcells_dir,    # e.g. /var/vcap/store/stemcells
       :repos_dir,        # e.g. /var/vcap/store/repos
     ].each do |attr|

data/lib/bosh-cloudfoundry/config/system_config.rb

@@ -25,6 +25,10 @@ class Bosh::CloudFoundry::Config::SystemConfig < Bosh::Cli::Config
     :bosh_provider,    # from list 'aws', 'openstack', 'vsphere', 'vcloud'
     :system_name,      # e.g. production
     :system_dir,       # e.g. /var/vcap/store/systems/production
+    :cf_release_git_repo, # e.g. "git://github.com/cloudfoundry/cf-release.git"
+    :cf_release_dir,   # e.g. /var/vcap/store/releases/cf-release
+    :cf_release_branch,     # e.g. staging
+    :cf_release_branch_dir, # e.g. /var/vcap/store/releases/cf-release/staging
     :release_name,     # e.g. 'appcloud'
     :release_version,  # e.g. 'latest'
     :gerrit_changes,   # e.g. ['84/13084/4', '37/13137/4']

data/lib/bosh-cloudfoundry/config_options.rb

@@ -29,7 +29,6 @@ module Bosh::CloudFoundry::ConfigOptions
     @common_config ||= begin
       config_file = options[:common_config] || DEFAULT_CONFIG_PATH
       common_config = Bosh::CloudFoundry::Config:: CommonConfig.new(config_file)
-      common_config.cf_release_git_repo ||= DEFAULT_CF_RELEASE_GIT_REPO
       common_config.bosh_git_repo ||= DEFAULT_BOSH_GIT_REPO
       common_config.save
       common_config
@@ -47,6 +46,7 @@ module Bosh::CloudFoundry::ConfigOptions
       system_config.bosh_target = options[:bosh_target] || config.target
       system_config.bosh_target_uuid = options[:bosh_target_uuid] || config.target_uuid
       system_config.bosh_provider = options[:bosh_provider] || bosh_cpi
+      system_config.cf_release_git_repo ||= DEFAULT_CF_RELEASE_GIT_REPO
       system_config.release_name ||= DEFAULT_RELEASE_NAME
       system_config.release_version ||= DEFAULT_RELEASE_VERSION
       system_config.stemcell_name ||= DEFAULT_STEMCELL_NAME
@@ -124,6 +124,13 @@ module Bosh::CloudFoundry::ConfigOptions
   # @return [String] BOSH target director UUID
   overriddable_config_option :bosh_target_uuid, :system_config
 
+  # @return [String] name of git branch to use to build/upload releases, e.g. "staging"
+  overriddable_config_option :cf_release_branch, :system_config
+
+  # @return [String] path to where git branch is cloned locally
+  # e.g. /var/vcap/store/releases/cf-release/staging
+  overriddable_config_option :cf_release_branch_dir, :system_config
+
   # @return [String] Name of BOSH release in target BOSH
   overriddable_config_option :release_name, :system_config
 
@@ -159,7 +166,7 @@ module Bosh::CloudFoundry::ConfigOptions
 
   # @return [String] CloudFoundry BOSH release git URI
   def cf_release_git_repo
-    options[:cf_release_git_repo] || common_config.cf_release_git_repo
+    options[:cf_release_git_repo] || system_config.cf_release_git_repo
   end
 
   # @return [String] Path to store BOSH release projects
@@ -169,13 +176,20 @@ module Bosh::CloudFoundry::ConfigOptions
 
   # @return [String] Path to cf-release BOSH release
   def cf_release_dir
-    options[:cf_release_dir] || common_config.cf_release_dir || begin
-      common_config.cf_release_dir = File.join(releases_dir, "cf-release")
-      common_config.save
-      common_config.cf_release_dir
+    options[:cf_release_dir] || system_config.cf_release_dir || begin
+      system_config.cf_release_dir = File.join(releases_dir, "cf-release")
+      system_config.save
+      system_config.cf_release_dir
     end
   end
 
+  # Switch to a different branch (and ultimately a different folder)
+  def set_cf_release_branch(branch)
+    system_config.cf_release_branch     = branch
+    system_config.cf_release_branch_dir = File.join(cf_release_dir, branch)
+    system_config.save
+  end
+
   # @return [String] Path to store stemcells locally
   def stemcells_dir
     options[:stemcells_dir] || common_config.stemcells_dir || choose_stemcells_dir

data/lib/bosh-cloudfoundry/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cloudfoundry
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/lib/bosh/cli/commands/cf.rb

@@ -127,43 +127,21 @@ module Bosh::Cli::Command
 
     usage "cf upload release"
     desc "fetch & upload latest public cloudfoundry release to BOSH"
-    # option "--dev", "Create development release from very latest cf-release commits & specific patches"
+    option "--branch branch", String, "Create development release from branch of cf-release [default: staging]"
     option "--final", "Upload latest final release from very latest cf-release commits"
     def upload_release
-      clone_or_update_cf_release
       if options.delete(:final)
+        clone_or_update_cf_release
         upload_final_release
       else
         # FUTURE once all patches from https://github.com/StarkAndWayne/bosh-cloudfoundry/issues/42
         # are merged into cf-release, then no more gerrit merging required
-        options[:dev] = true
-        merge_gerrit(*%w[37/13137/4 84/13084/4])
-        # create_and_upload_dev_release
-      end
-    end
-
-    usage "cf merge gerrit"
-    desc "create development release including one or more gerrit patches"
-    def merge_gerrit(*gerrit_changes)
-      # gerrit_change might be:
-      # * refs/changes/84/13084/4
-      # * 84/13084/4
-      # * 'git pull http://reviews.cloudfoundry.org/cf-release refs/changes/84/13084/4'
-      gerrit_changes.each do |gerrit_change|
-        if refs_change = extract_refs_change(gerrit_change)
-          add_gerrit_refs_change(refs_change)
-        else
-          say "Please provide the gerrit change information in one of the following formats:".red
-          say " -> bosh cf merge gerrit refs/changes/84/13084/4"
-          say " -> bosh cf merge gerrit 84/13084/4"
-          say " -> bosh cf merge gerrit 'git pull http://reviews.cloudfoundry.org/cf-release refs/changes/84/13084/4'"
-          say ""
-          say "Please re-run the command again with the change reference formatted as above.".red
-          exit 1
+        if new_branch = options.delete(:branch)
+          set_cf_release_branch(new_branch)
         end
+        clone_or_update_cf_release
+        create_and_upload_dev_release
       end
-      apply_gerrit_patches
-      create_and_upload_dev_release(release_name)
     end
 
     usage "cf deploy"
@@ -557,6 +535,8 @@ module Bosh::Cli::Command
     def generate_generatable_options
       common_password
       security_group
+
+      set_cf_release_branch("staging")
     end
 
     # Renders the +SystemConfig+ model (+system_config+) into the system's

data/spec/unit/bosh_release_manager_spec.rb

@@ -8,24 +8,51 @@ describe Bosh::CloudFoundry::BoshReleaseManager do
 
   attr_reader :system_config
 
+  # accessors provided by config_options.rb
+  attr_accessor :cf_release_dir, :cf_release_branch, :cf_release_branch_dir
+
   before do
     @system_dir = File.join(Dir.mktmpdir, "systems", "production")
+    @cf_release_dir = File.join(Dir.mktmpdir, "releases", "cf-release")
     mkdir_p(@system_dir)
     @system_config = Bosh::CloudFoundry::Config::SystemConfig.new(@system_dir)
   end
 
+  it "clone_or_update_cf_release - updates master branch" do
+    self.cf_release_branch     = "master"
+    self.cf_release_branch_dir = File.join(cf_release_dir, "master")
+    mkdir_p(cf_release_branch_dir)
+    should_receive(:sh).with("git pull origin master --no-recurse-submodules")
+    should_receive(:sh).with("sed -i 's#git@github.com:#https://github.com/#g' .gitmodules")
+    should_receive(:sh).with("sed -i 's#git://github.com#https://github.com#g' .gitmodules")
+    should_receive(:sh).with("git submodule update --init --recursive")
+    clone_or_update_cf_release
+  end
+
+  it "clone_or_update_cf_release - updates staging branch" do
+    self.cf_release_branch     = "staging"
+    self.cf_release_branch_dir = File.join(cf_release_dir, "staging")
+    mkdir_p(cf_release_branch_dir)
+    should_receive(:sh).with("git pull origin staging --no-recurse-submodules")
+    should_receive(:sh).with("sed -i 's#git@github.com:#https://github.com/#g' .gitmodules")
+    should_receive(:sh).with("sed -i 's#git://github.com#https://github.com#g' .gitmodules")
+    should_receive(:sh).with("git submodule update --init --recursive")
+    clone_or_update_cf_release
+  end
+
   describe "switch release types" do
     it "from final to dev" do
+      self.cf_release_branch     = "staging"
       @system_config.release_name = "appcloud"
       @system_config.release_version = "latest"
       @system_config.save
       switch_to_development_release
-      @system_config.release_name.should == "appcloud-dev"
+      @system_config.release_name.should == "appcloud-staging"
       @system_config.release_version.should == "latest"
     end
 
     it "from dev to final" do
-      @system_config.release_name = "appcloud-dev"
+      @system_config.release_name = "appcloud-staging"
       @system_config.release_version = "latest"
       @system_config.save
       switch_to_final_release

data/spec/unit/cf_command_spec.rb

@@ -80,29 +80,32 @@ describe Bosh::Cli::Command::Base do
       @cmd.upload_stemcell
     end
 
-    it "updates/creates/uploads final cf-release" do
-      cf_release_dir = File.join(@releases_dir, "cf-release")
-      FileUtils.mkdir_p(cf_release_dir)
-      @cmd.common_config.cf_release_dir = cf_release_dir
-
-      @cmd.should_receive(:sh).with("git pull origin master")
-      script = <<-BASH.gsub(/^      /, '')
-      grep -rI "github.com" * .gitmodules | awk 'BEGIN {FS=":"} { print($1) }' | uniq while read file
-      do
-        echo "changing - $file"
-        sed -i 's#git://github.com#https://github.com#g' $file
-        sed -i 's#git@github.com:#https://github.com:#g' $file
-      done
-      BASH
-      @cmd.should_receive(:sh).with("sed -i 's#git@github.com:#https://github.com/#g' .gitmodules")
-      @cmd.should_receive(:sh).with("sed -i 's#git://github.com#https://github.com#g' .gitmodules")
-      @cmd.should_receive(:sh).with("git submodule update --init --recursive")
-      @cmd.should_receive(:`).with("tail -n 1 releases/index.yml | awk '{print $2}'").
-        and_return("126")
-      @cmd.should_receive(:sh).with("bosh -n --color upload release releases/appcloud-126.yml")
-      @cmd.add_option(:final, true)
-      @cmd.upload_release
-    end
+    it "updates/creates/uploads final cf-release"
+    #  do
+    #   cf_release_dir = File.join(@releases_dir, "cf-release")
+    #   FileUtils.mkdir_p(cf_release_dir)
+    #   @cmd.system_config.cf_release_dir = cf_release_dir
+    #   @cmd.system_config.cf_release_branch = "staging"
+    #   @cmd.system_config.cf_release_branch_dir = File.join(cf_release_dir, "staging")
+    # 
+    #   @cmd.should_receive(:sh).with("git pull origin master")
+    #   script = <<-BASH.gsub(/^      /, '')
+    #   grep -rI "github.com" * .gitmodules | awk 'BEGIN {FS=":"} { print($1) }' | uniq while read file
+    #   do
+    #     echo "changing - $file"
+    #     sed -i 's#git://github.com#https://github.com#g' $file
+    #     sed -i 's#git@github.com:#https://github.com:#g' $file
+    #   done
+    #   BASH
+    #   @cmd.should_receive(:sh).with("sed -i 's#git@github.com:#https://github.com/#g' .gitmodules")
+    #   @cmd.should_receive(:sh).with("sed -i 's#git://github.com#https://github.com#g' .gitmodules")
+    #   @cmd.should_receive(:sh).with("git submodule update --init --recursive")
+    #   @cmd.should_receive(:`).with("tail -n 1 releases/index.yml | awk '{print $2}'").
+    #     and_return("126")
+    #   @cmd.should_receive(:sh).with("bosh -n --color upload release releases/appcloud-126.yml")
+    #   @cmd.add_option(:final, true)
+    #   @cmd.upload_release
+    # end
 
     it "updates/creates/uploads development/edge cf-release (requires system setup)" 
     # TODO turn this into a unit test for the specific methods
@@ -124,7 +127,7 @@ describe Bosh::Cli::Command::Base do
     #   @cmd.should_receive(:sh).with("sed -i 's#git@github.com:#https://github.com/#g' .gitmodules")
     #   @cmd.should_receive(:sh).with("sed -i 's#git://github.com#https://github.com#g' .gitmodules")
     #   @cmd.should_receive(:sh).with("git submodule update --init --recursive")
-    #   @cmd.should_receive(:write_dev_config_file).with("appcloud-dev")
+    #   @cmd.should_receive(:write_dev_config_file).with("appcloud-staging")
     #   @cmd.should_receive(:sh).with("bosh create release --with-tarball --force")
     #   @cmd.should_receive(:sh).with("bosh -n --color upload release")
     #   @cmd.upload_release
@@ -152,11 +155,11 @@ describe Bosh::Cli::Command::Base do
       if needs_initial_release_uploaded
         cmd.should_receive(:bosh_releases).exactly(1).times.and_return([])
         cmd.should_receive(:clone_or_update_cf_release)
-        cmd.should_receive(:merge_gerrit).with(*%w[37/13137/4 84/13084/4])
+        cmd.should_receive(:create_and_upload_dev_release)
       else
         cmd.should_receive(:bosh_releases).exactly(1).times.and_return([
           {"name"=>"appcloud", "versions"=>["124", "126"], "in_use"=>[]},
-          {"name"=>"appcloud-dev", "versions"=>["124.1-dev", "126.1-dev"], "in_use"=>[]},
+          {"name"=>"appcloud-staging", "versions"=>["124.1-dev", "126.1-dev"], "in_use"=>[]},
         ])
       end
 
@@ -178,7 +181,7 @@ describe Bosh::Cli::Command::Base do
       cmd.add_option(:core_server_flavor, 'm1.large')
       cmd.add_option(:admin_emails, ['drnic@starkandwayne.com'])
 
-      cmd.common_config.cf_release_dir = @releases_dir
+      cmd.common_config.releases_dir = @releases_dir
       cmd.common_config.stemcells_dir = @stemcells_dir
 
       cmd.system.should be_nil
@@ -196,7 +199,7 @@ describe Bosh::Cli::Command::Base do
     it "temporarily uploads latest stemcell & patched cf-release by default" do
       generate_new_system(@cmd)
       File.basename(@cmd.system).should == "production"
-      @cmd.system_config.release_name.should == "appcloud-dev"
+      @cmd.system_config.release_name.should == "appcloud-staging"
     end
 
     it "new system has common random password" do
@@ -290,15 +293,6 @@ describe Bosh::Cli::Command::Base do
       @cmd.watch_nats
     end
 
-    it "merges gerrit patches" do
-      generate_new_system
-      @cmd.should_receive(:create_and_change_into_patches_branch)
-      @cmd.should_receive(:sh).
-        with("git pull http://reviews.cloudfoundry.org/cf-release refs/changes/84/13084/4")
-      @cmd.should_receive(:create_and_upload_dev_release)
-      @cmd.merge_gerrit("refs/changes/84/13084/4")
-    end
-
     it "returns bosh_release_versions" do
       @cmd.should_receive(:bosh_releases).exactly(3).times.and_return([
         {"name"=>"appcloud", "versions"=>["124", "126"], "in_use"=>[]},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3570084276239392817
+      hash: 3552248026887533179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3570084276239392817
+      hash: 3552248026887533179
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24