opsmgr 0.34.17 → 0.34.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1d8c27e3a445cb069e3504e40eda270fbcff60
-  data.tar.gz: c620fdb0116604ea67cff20f91fcde94e94f6968
+  metadata.gz: 922897d2db04a60635f2e8790a2ebc7be2cf8591
+  data.tar.gz: e74ac01e5f673bfe3b066ec0877bc3c8b38bcd8d
 SHA512:
-  metadata.gz: 8deb15863ca4610bb90a407e2a440b18411096c4bb1e561db5dbb358154ca4521a1f36efd5115cdd87753013008c9a00eb3d16a54fb0017afdbd9cd5b50c794f
-  data.tar.gz: cec83e78da4e427d7881905633b40fe9f1d55f448e400afd0726d935b0195840c33a2f3f973d28f181daf87d74e693e0ae526ec64242d876bc77d0fa7b61c859
+  metadata.gz: 58468c31908102cc727bb207e9c2c5d6e537df00c8d2ab77a3690aa4e49c5d38315e2e027ea85ac70b58821c3ad3c8236ab969f46583e6d0ae9f44e0b8233747
+  data.tar.gz: 982ae9453bbf9ffb5a1720b4ba52052a59c5ed3a811305416ef205c06d50aeb990f56df3250870e3c9d1e60babfa6457ca085c19d1190939217afc72b0db1717

data/lib/opsmgr/tasks/opsmgr.rake

@@ -1,12 +1,13 @@
 namespace :opsmgr do
   desc 'Trigger an install on Ops Manager for the specified environment'
-  task :trigger_install, [:environment, :om_version, :install_timeout] do |_, args|
+  task :trigger_install, [:environment, :om_version, :install_timeout, :poll_interval] do |_, args|
+    args.with_defaults(poll_interval: '30')
     require 'opsmgr/ui_helpers/ui_spec_runner'
 
     UiSpecRunner.new(
       environment: args.environment,
       om_version: args.om_version
-    ).trigger_install(args.install_timeout)
+    ).trigger_install(args.install_timeout, args.poll_interval)
   end
 
   desc 'Get latest install log from Ops Manager'
@@ -102,7 +103,8 @@ namespace :opsmgr do
   end
 
   desc 'Delete a product'
-  task :delete_product, [:environment, :om_version, :product_name, :timeout] do |_, args|
+  task :delete_product, [:environment, :om_version, :product_name, :timeout, :poll_interval] do |_, args|
+    args.with_defaults(poll_interval: '30')
     require 'opsmgr/ui_helpers/ui_spec_runner'
 
     DEFAULT_DELETE_TIMEOUT = 25
@@ -110,11 +112,12 @@ namespace :opsmgr do
     UiSpecRunner.new(
       environment: args.environment,
       om_version: args.om_version
-    ).delete_product(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s)
+    ).delete_product(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s, args.poll_interval)
   end
 
   desc 'Delete a product if present (will not fail if product is not preset)'
-  task :delete_product_if_present, [:environment, :om_version, :product_name, :timeout] do |_, args|
+  task :delete_product_if_present, [:environment, :om_version, :product_name, :timeout, :poll_interval] do |_, args|
+    args.with_defaults(poll_interval: '10')
     require 'opsmgr/ui_helpers/ui_spec_runner'
 
     DEFAULT_DELETE_TIMEOUT = 25
@@ -122,7 +125,7 @@ namespace :opsmgr do
     UiSpecRunner.new(
       environment: args.environment,
       om_version: args.om_version
-    ).delete_product_if_present(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s)
+    ).delete_product_if_present(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s, args.poll_interval)
   end
 
   desc 'Delete unused products'

data/lib/opsmgr/ui_helpers/config_helper.rb

@@ -37,6 +37,10 @@ module SettingsHelper
     ENV.fetch('INSTALL_TIMEOUT').to_i
   end
 
+  def poll_interval
+    ENV.fetch('POLL_INTERVAL').to_i
+  end
+
   def delete_timeout
     Integer(ENV.fetch('DELETE_TIMEOUT'))
   end

data/lib/opsmgr/ui_helpers/delete_product_if_present_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe 'Deleting a product if it is present', order: :defined do
     if current_ops_manager.product_dashboard.product_on_dashboard?(product_name)
       current_ops_manager.product_dashboard.delete_product(product_name)
       current_ops_manager.product_dashboard.apply_updates
-      poll_up_to_mins(delete_timeout) do
+      poll_up_to_mins(delete_timeout, poll_interval) do
         expect(current_ops_manager.state_change_progress).to be_state_change_success
       end
     else

data/lib/opsmgr/ui_helpers/delete_product_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe 'Deleting a product', order: :defined do
   end
 
   it 'waits for a successful installation' do
-    poll_up_to_mins(delete_timeout) do
+    poll_up_to_mins(delete_timeout, poll_interval) do
       expect(current_ops_manager.state_change_progress).to be_state_change_success
     end
   end

data/lib/opsmgr/ui_helpers/trigger_install_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe 'Triggering Install', order: :defined do
   end
 
   it 'waits for a successful installation' do
-    poll_up_to_mins(install_timeout) do
+    poll_up_to_mins(install_timeout, poll_interval) do
       expect(current_ops_manager.state_change_progress).to be_state_change_success
     end
   end

data/lib/opsmgr/ui_helpers/ui_spec_runner.rb

@@ -17,8 +17,9 @@ class UiSpecRunner
     run_spec([microbosh_spec_path + '/configure_microbosh_spec.rb'])
   end
 
-  def trigger_install(install_timeout)
+  def trigger_install(install_timeout, poll_interval)
     ENV['INSTALL_TIMEOUT'] = install_timeout
+    ENV['POLL_INTERVAL'] = poll_interval
 
     run_spec([spec_path + '/trigger_install_spec.rb'])
   end
@@ -55,16 +56,18 @@ class UiSpecRunner
     run_spec([spec_path + '/delete_installation_spec.rb'])
   end
 
-  def delete_product(product_name, timeout)
+  def delete_product(product_name, timeout, poll_interval)
     ENV['PRODUCT_NAME'] = product_name
     ENV['DELETE_TIMEOUT'] = timeout
+    ENV['POLL_INTERVAL'] = poll_interval
 
     run_spec([spec_path + '/delete_product_spec.rb'])
   end
 
-  def delete_product_if_present(product_name, timeout)
+  def delete_product_if_present(product_name, timeout, poll_interval)
     ENV['PRODUCT_NAME'] = product_name
     ENV['DELETE_TIMEOUT'] = timeout
+    ENV['POLL_INTERVAL'] = poll_interval
 
     run_spec([spec_path + '/delete_product_if_present_spec.rb'])
   end

data/lib/opsmgr/version.rb

@@ -1,5 +1,5 @@
 module Opsmgr
-  VERSION = '0.34.17'.freeze
+  VERSION = '0.34.18'.freeze
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.
 # All rights reserved.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsmgr
 version: !ruby/object:Gem::Version
-  version: 0.34.17
+  version: 0.34.18
 platform: ruby
 authors:
 - Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -112,16 +112,16 @@ dependencies:
   name: ops_manager_ui_drivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.9
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement