clc-promote 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b10c9acfc5f5b2f181a84eb1b7415369965e8f
-  data.tar.gz: bc443577ed51404ceb92d84f781a818a2451c49b
+  metadata.gz: f5633c6eb35655f0e48f3ca0c541518a2f77ca04
+  data.tar.gz: 5175538852c4345a2b3d79c7fe91be9b89b57ab3
 SHA512:
-  metadata.gz: fe5616c464c398a0723b6dfa1381045168867e815def32f470579a34bbc9f90f49da186819c3664e1017c653c6c196741de62d50b4da7423908540c6ca287dbc
-  data.tar.gz: 6410adce8ec11b13160d041d2af80c77c925c08aaa934bd956d63342c09b463fac416ef25abeb048d2202fe563420a8dbee0f339f7048f286dafa52d64b31dc5
+  metadata.gz: 0270705d80833cda8010dbac523b1265a3e853a3fc8e4b59207362f9834a2471f74496df0d948ebbb8dd6497c3c9f39bde5b0786b9243674c1a0fe1d75707a40
+  data.tar.gz: 6e2a1384d06f75ef43b050ffa5540487e664bc4f68126b09345ace9017175cc4de06276a0416d35c51c9d58dc693daeef36c2900bd0298b67dacf672aa557a69

data/lib/promote/promoter.rb

@@ -20,9 +20,34 @@ module Promote
       dest.write_cookbook_versions(source.cookbook_versions)
     end
 
-    def monitor_promotion(source_environment, destination_environments, probe_interval, ui = nil)
+    def monitor_promotion(source_environment, destination_environments, probe_interval, max_wait = 3600, ui = nil)
       destination_environments.each do |env|
-        promote_to(source_environment, env, ui)        
+        promote_to(source_environment, env, ui)
+        start = Time.now.to_i
+        finder = NodeFinder.new("chef_environment:#{env}", config)
+        unconverged = nil
+        converged = []
+        until Time.now.to_i - start > max_wait
+          result = finder.search
+          unconverged = []
+          result.each do |node|
+            if node['ohai_time'].to_i < start
+              unconverged << node
+            elsif converged.grep(/#{node.name}/).empty?
+              converged << node.name
+              ui.info "#{node.name} has converged" if ui
+            end
+          end
+          break if unconverged.count == 0
+
+          ui.stdout.print "." if ui
+          
+          sleep probe_interval
+        end
+
+        if unconverged.count > 0
+          raise "Stopping promotion! Nodes (#{unconverged}) are not converging in #{env}"
+        end
       end
     end
 

data/lib/promote/rake_tasks.rb

@@ -99,9 +99,9 @@ module Promote
     def define_promote_environment
       namespace "Promote" do
         desc "Promote one environment from another"
-        task "promote_environment", :source_environment, :destination_environments do |task, args|
-          puts "Promoting constraints in #{args.source_environment} to #{args.destination_environments}"
-          @promoter.monitor_promotion(args.source_environment, args.destination_environments, 60 * 5)
+        task "promote_environment", :source_environment, :destination_environment do |task, args|
+          puts "Promoting constraints in #{args.source_environment} to #{args.destination_environment}"
+          deps = @promoter.promote_to(args.source_environment, args.destination_environment)
         end
       end
     end
@@ -110,8 +110,8 @@ module Promote
       namespace "Promote" do
         desc "Promote a list of environments from another"
         task "promote_environments", :source_environment, :destination_environments do |task, args|
-          puts "Promoting constraints in #{args.source_environment} to #{args.destination_environment}"
-          deps = @promoter.promote_to(args.source_environment, args.destination_environment)
+          puts "Promoting constraints in #{args.source_environment} to #{args.destination_environments}"
+          @promoter.monitor_promotion(args.source_environment, args.destination_environments, 60 * 5)
         end
       end
     end

data/lib/promote/version.rb

@@ -1,3 +1,3 @@
 module Promote
-  VERSION = '0.7.9'
+  VERSION = '0.7.10'
 end

data/spec/unit/promote/promoter_spec.rb

@@ -7,6 +7,8 @@ describe Promote::Promoter do
     :client_key => 'key', 
     :chef_server_url => 'https://some.chef.server'}) }
 
+  let(:ui) { Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {}) }
+
   subject { Promote::Promoter.new(config) }
 
   context "promote_to" do
@@ -63,14 +65,17 @@ describe Promote::Promoter do
     let(:finder_bad){ double('node_finder', :search => [bad_node]) }
     let (:good_node) {
       node = Chef::Node.new
+      node.name "good_node"
       node.default["ohai_time"] = Time.now.to_i + 3600
       node
     }
     let (:bad_node) {
       node = Chef::Node.new
+      node.name "bad_node"
       node.default["ohai_time"] = Time.now.to_i - 3600
       node
     }
+    let(:ui) { nil }
 
     before {
       allow(Promote::NodeFinder).to receive(:new).and_return(finder_good)
@@ -78,10 +83,10 @@ describe Promote::Promoter do
 
     context "all environments succeed" do
       it "promotes all nodes" do
-        expect(subject).to receive(:promote_to).with("env1", "env2", nil)
-        expect(subject).to receive(:promote_to).with("env1", "env3", nil)
-        expect(subject).to receive(:promote_to).with("env1", "env4", nil)
-        subject.monitor_promotion("env1", ["env2", "env3", "env4"], 1)
+        expect(subject).to receive(:promote_to).with("env1", "env2", ui)
+        expect(subject).to receive(:promote_to).with("env1", "env3", ui)
+        expect(subject).to receive(:promote_to).with("env1", "env4", ui)
+        subject.monitor_promotion("env1", ["env2", "env3", "env4"], 0.25, 1, ui)
       end
     end
 
@@ -91,11 +96,10 @@ describe Promote::Promoter do
       }
 
       it "stops on failure" do
-
-        expect(subject).to receive(:promote_to).with("env1", "env2", nil)
-        expect(subject).not_to receive(:promote_to).with("env1", "env3", nil)
-        expect(subject).not_to receive(:promote_to).with("env1", "env4", nil)
-        subject.monitor_promotion("env1", ["env2", "env3", "env4"], 1)
+        expect(subject).to receive(:promote_to).with("env1", "env2", ui)
+        expect(subject).to receive(:promote_to).with("env1", "env3", ui)
+        expect(subject).not_to receive(:promote_to).with("env1", "env4", ui)
+        expect{ subject.monitor_promotion("env1", ["env2", "env3", "env4"], 0.25, 1, ui) }.to raise_error(/env3$/)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clc-git