opsmgr 0.34.17 → 0.34.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/opsmgr/tasks/opsmgr.rake +9 -6
- data/lib/opsmgr/ui_helpers/config_helper.rb +4 -0
- data/lib/opsmgr/ui_helpers/delete_product_if_present_spec.rb +1 -1
- data/lib/opsmgr/ui_helpers/delete_product_spec.rb +1 -1
- data/lib/opsmgr/ui_helpers/trigger_install_spec.rb +1 -1
- data/lib/opsmgr/ui_helpers/ui_spec_runner.rb +6 -3
- data/lib/opsmgr/version.rb +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 922897d2db04a60635f2e8790a2ebc7be2cf8591
|
4
|
+
data.tar.gz: e74ac01e5f673bfe3b066ec0877bc3c8b38bcd8d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 58468c31908102cc727bb207e9c2c5d6e537df00c8d2ab77a3690aa4e49c5d38315e2e027ea85ac70b58821c3ad3c8236ab969f46583e6d0ae9f44e0b8233747
|
7
|
+
data.tar.gz: 982ae9453bbf9ffb5a1720b4ba52052a59c5ed3a811305416ef205c06d50aeb990f56df3250870e3c9d1e60babfa6457ca085c19d1190939217afc72b0db1717
|
@@ -1,12 +1,13 @@
|
|
1
1
|
namespace :opsmgr do
|
2
2
|
desc 'Trigger an install on Ops Manager for the specified environment'
|
3
|
-
task :trigger_install, [:environment, :om_version, :install_timeout] do |_, args|
|
3
|
+
task :trigger_install, [:environment, :om_version, :install_timeout, :poll_interval] do |_, args|
|
4
|
+
args.with_defaults(poll_interval: '30')
|
4
5
|
require 'opsmgr/ui_helpers/ui_spec_runner'
|
5
6
|
|
6
7
|
UiSpecRunner.new(
|
7
8
|
environment: args.environment,
|
8
9
|
om_version: args.om_version
|
9
|
-
).trigger_install(args.install_timeout)
|
10
|
+
).trigger_install(args.install_timeout, args.poll_interval)
|
10
11
|
end
|
11
12
|
|
12
13
|
desc 'Get latest install log from Ops Manager'
|
@@ -102,7 +103,8 @@ namespace :opsmgr do
|
|
102
103
|
end
|
103
104
|
|
104
105
|
desc 'Delete a product'
|
105
|
-
task :delete_product, [:environment, :om_version, :product_name, :timeout] do |_, args|
|
106
|
+
task :delete_product, [:environment, :om_version, :product_name, :timeout, :poll_interval] do |_, args|
|
107
|
+
args.with_defaults(poll_interval: '30')
|
106
108
|
require 'opsmgr/ui_helpers/ui_spec_runner'
|
107
109
|
|
108
110
|
DEFAULT_DELETE_TIMEOUT = 25
|
@@ -110,11 +112,12 @@ namespace :opsmgr do
|
|
110
112
|
UiSpecRunner.new(
|
111
113
|
environment: args.environment,
|
112
114
|
om_version: args.om_version
|
113
|
-
).delete_product(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s)
|
115
|
+
).delete_product(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s, args.poll_interval)
|
114
116
|
end
|
115
117
|
|
116
118
|
desc 'Delete a product if present (will not fail if product is not preset)'
|
117
|
-
task :delete_product_if_present, [:environment, :om_version, :product_name, :timeout] do |_, args|
|
119
|
+
task :delete_product_if_present, [:environment, :om_version, :product_name, :timeout, :poll_interval] do |_, args|
|
120
|
+
args.with_defaults(poll_interval: '10')
|
118
121
|
require 'opsmgr/ui_helpers/ui_spec_runner'
|
119
122
|
|
120
123
|
DEFAULT_DELETE_TIMEOUT = 25
|
@@ -122,7 +125,7 @@ namespace :opsmgr do
|
|
122
125
|
UiSpecRunner.new(
|
123
126
|
environment: args.environment,
|
124
127
|
om_version: args.om_version
|
125
|
-
).delete_product_if_present(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s)
|
128
|
+
).delete_product_if_present(args.product_name, args.timeout || DEFAULT_DELETE_TIMEOUT.to_s, args.poll_interval)
|
126
129
|
end
|
127
130
|
|
128
131
|
desc 'Delete unused products'
|
@@ -19,7 +19,7 @@ RSpec.describe 'Deleting a product if it is present', order: :defined do
|
|
19
19
|
if current_ops_manager.product_dashboard.product_on_dashboard?(product_name)
|
20
20
|
current_ops_manager.product_dashboard.delete_product(product_name)
|
21
21
|
current_ops_manager.product_dashboard.apply_updates
|
22
|
-
poll_up_to_mins(delete_timeout) do
|
22
|
+
poll_up_to_mins(delete_timeout, poll_interval) do
|
23
23
|
expect(current_ops_manager.state_change_progress).to be_state_change_success
|
24
24
|
end
|
25
25
|
else
|
@@ -24,7 +24,7 @@ RSpec.describe 'Deleting a product', order: :defined do
|
|
24
24
|
end
|
25
25
|
|
26
26
|
it 'waits for a successful installation' do
|
27
|
-
poll_up_to_mins(delete_timeout) do
|
27
|
+
poll_up_to_mins(delete_timeout, poll_interval) do
|
28
28
|
expect(current_ops_manager.state_change_progress).to be_state_change_success
|
29
29
|
end
|
30
30
|
end
|
@@ -20,7 +20,7 @@ RSpec.describe 'Triggering Install', order: :defined do
|
|
20
20
|
end
|
21
21
|
|
22
22
|
it 'waits for a successful installation' do
|
23
|
-
poll_up_to_mins(install_timeout) do
|
23
|
+
poll_up_to_mins(install_timeout, poll_interval) do
|
24
24
|
expect(current_ops_manager.state_change_progress).to be_state_change_success
|
25
25
|
end
|
26
26
|
end
|
@@ -17,8 +17,9 @@ class UiSpecRunner
|
|
17
17
|
run_spec([microbosh_spec_path + '/configure_microbosh_spec.rb'])
|
18
18
|
end
|
19
19
|
|
20
|
-
def trigger_install(install_timeout)
|
20
|
+
def trigger_install(install_timeout, poll_interval)
|
21
21
|
ENV['INSTALL_TIMEOUT'] = install_timeout
|
22
|
+
ENV['POLL_INTERVAL'] = poll_interval
|
22
23
|
|
23
24
|
run_spec([spec_path + '/trigger_install_spec.rb'])
|
24
25
|
end
|
@@ -55,16 +56,18 @@ class UiSpecRunner
|
|
55
56
|
run_spec([spec_path + '/delete_installation_spec.rb'])
|
56
57
|
end
|
57
58
|
|
58
|
-
def delete_product(product_name, timeout)
|
59
|
+
def delete_product(product_name, timeout, poll_interval)
|
59
60
|
ENV['PRODUCT_NAME'] = product_name
|
60
61
|
ENV['DELETE_TIMEOUT'] = timeout
|
62
|
+
ENV['POLL_INTERVAL'] = poll_interval
|
61
63
|
|
62
64
|
run_spec([spec_path + '/delete_product_spec.rb'])
|
63
65
|
end
|
64
66
|
|
65
|
-
def delete_product_if_present(product_name, timeout)
|
67
|
+
def delete_product_if_present(product_name, timeout, poll_interval)
|
66
68
|
ENV['PRODUCT_NAME'] = product_name
|
67
69
|
ENV['DELETE_TIMEOUT'] = timeout
|
70
|
+
ENV['POLL_INTERVAL'] = poll_interval
|
68
71
|
|
69
72
|
run_spec([spec_path + '/delete_product_if_present_spec.rb'])
|
70
73
|
end
|
data/lib/opsmgr/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: opsmgr
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.34.
|
4
|
+
version: 0.34.18
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Release Engineering
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-04-
|
11
|
+
date: 2016-04-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -112,16 +112,16 @@ dependencies:
|
|
112
112
|
name: ops_manager_ui_drivers
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- - "
|
115
|
+
- - "~>"
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version:
|
117
|
+
version: 2.10.9
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- - "
|
122
|
+
- - "~>"
|
123
123
|
- !ruby/object:Gem::Version
|
124
|
-
version:
|
124
|
+
version: 2.10.9
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: mustache
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|