openshift-origin-controller 1.3.3 → 1.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of openshift-origin-controller might be problematic. Click here for more details.
- data/rubygem-openshift-origin-controller.spec +17 -1
- data/test/cucumber/cartridge-10gen-mms-agent.feature +1 -0
- data/test/cucumber/cartridge-lifecycle-nodejs.feature +1 -0
- data/test/cucumber/cartridge-lifecycle-php.feature +1 -0
- data/test/cucumber/cartridge-lifecycle-ruby18.feature +1 -0
- data/test/cucumber/cartridge-mongodb.feature +1 -0
- data/test/cucumber/cartridge-phpmyadmin.feature +1 -0
- data/test/cucumber/cartridge-runtime-extended-nodejs.feature +1 -0
- data/test/cucumber/cartridge-runtime-standard-nodejs.feature +1 -0
- data/test/cucumber/step_definitions/cartridge-jenkins_steps.rb +5 -1
- data/test/cucumber/step_definitions/cartridge-postgresql-extended_steps.rb +1 -1
- data/test/cucumber/step_definitions/client_steps.rb +1 -5
- data/test/cucumber/step_definitions/trap-user_steps.rb +1 -1
- data/test/cucumber/support/00_setup_helper.rb +1 -12
- data/test/cucumber/support/command_helper.rb +17 -17
- metadata +4 -4
@@ -9,7 +9,7 @@
|
|
9
9
|
|
10
10
|
Summary: Cloud Development Controller
|
11
11
|
Name: rubygem-%{gem_name}
|
12
|
-
Version: 1.3.
|
12
|
+
Version: 1.3.4
|
13
13
|
Release: 1%{?dist}
|
14
14
|
Group: Development/Languages
|
15
15
|
License: ASL 2.0
|
@@ -79,6 +79,22 @@ mkdir -p %{buildroot}/etc/openshift/
|
|
79
79
|
%{gem_dir}/doc/%{gem_name}-%{version}
|
80
80
|
|
81
81
|
%changelog
|
82
|
+
* Mon Jan 14 2013 Adam Miller <admiller@redhat.com> 1.3.4-1
|
83
|
+
- Merge pull request #1145 from bdecoste/master
|
84
|
+
(dmcphers+openshiftbot@redhat.com)
|
85
|
+
- Merge pull request #1146 from pmorie/bugs/fix-tests2
|
86
|
+
(dmcphers+openshiftbot@redhat.com)
|
87
|
+
- increase jenkins creation timeout (bdecoste@gmail.com)
|
88
|
+
- Fix failing socket file tests (pmorie@gmail.com)
|
89
|
+
- Merge pull request #916 from Miciah/devenv-fixes-2
|
90
|
+
(dmcphers+openshiftbot@redhat.com)
|
91
|
+
- Merge pull request #1142 from bdecoste/master
|
92
|
+
(dmcphers+openshiftbot@redhat.com)
|
93
|
+
- kill orphan jenkins process (bdecoste@gmail.com)
|
94
|
+
- harden JSON parsing for jenkins test (bdecoste@gmail.com)
|
95
|
+
- Add @not-enterprise tag to some tests (miciah.masters@gmail.com)
|
96
|
+
- Fix tests to use newer-style rhc invocations (miciah.masters@gmail.com)
|
97
|
+
|
82
98
|
* Thu Jan 10 2013 Adam Miller <admiller@redhat.com> 1.3.3-1
|
83
99
|
- increased jenkins test timeout (bdecoste@gmail.com)
|
84
100
|
- Merge pull request #1134 from bdecoste/master
|
@@ -14,7 +14,7 @@ When /^I configure a hello_world diy application with jenkins enabled$/ do
|
|
14
14
|
|
15
15
|
register_user(@app.login, @app.password) if $registration_required
|
16
16
|
if rhc_create_domain(@app)
|
17
|
-
@diy_app = rhc_create_app(@app, false, '--enable-jenkins --timeout=
|
17
|
+
@diy_app = rhc_create_app(@app, false, '--enable-jenkins --timeout=300')
|
18
18
|
@diy_app.create_app_code.should be == 0
|
19
19
|
else
|
20
20
|
raise "Failed to create domain: #{@app}"
|
@@ -77,6 +77,8 @@ Then /^the application will be updated$/ do
|
|
77
77
|
$logger.debug "@jenkins_build response = #{response}"
|
78
78
|
|
79
79
|
job = JSON.parse(response)
|
80
|
+
rescue => e
|
81
|
+
$logger.warn "Unexpected exception checking update: #{e.message}\n#{e.backtrace.join("\n")}"
|
80
82
|
end while job['color'] != 'blue'
|
81
83
|
end
|
82
84
|
job['color'].should be == 'blue'
|
@@ -90,4 +92,6 @@ end
|
|
90
92
|
|
91
93
|
Then /^I deconfigure the diy application with jenkins enabled$/ do
|
92
94
|
rhc_ctl_destroy(@app, false)
|
95
|
+
@app.name='jenkins'
|
96
|
+
rhc_ctl_destroy(@app, false)
|
93
97
|
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
When /^I select from the postgresql database using the socket file$/ do
|
2
|
-
cmd = ssh_command("-o LogLevel=quiet \"PGPASSWORD=\\$OPENSHIFT_POSTGRESQL_DB_PASSWORD /usr/bin/psql -U admin -h \\$OPENSHIFT_POSTGRESQL_DB_SOCKET -d #{@app.name} -
|
2
|
+
cmd = ssh_command("-o LogLevel=quiet \"export PGPASSWORD=\\$OPENSHIFT_POSTGRESQL_DB_PASSWORD; echo 'select 1; \\q' | /usr/bin/psql -U admin -h \\$OPENSHIFT_POSTGRESQL_DB_SOCKET -d #{@app.name} -t\"")
|
3
3
|
|
4
4
|
$logger.debug "Running #{cmd}"
|
5
5
|
|
@@ -3,10 +3,6 @@ Given /^an accepted node$/ do
|
|
3
3
|
end
|
4
4
|
|
5
5
|
Given /^the libra client tools$/ do
|
6
|
-
File.exists?($create_app_script).should be_true
|
7
|
-
File.exists?($create_domain_script).should be_true
|
8
6
|
File.exists?($client_config).should be_true
|
9
|
-
File.exists?($ctl_app_script).should be_true
|
10
|
-
|
11
7
|
File.exists?($rhc_script).should be_true
|
12
|
-
end
|
8
|
+
end
|
@@ -2,7 +2,7 @@ require 'pty'
|
|
2
2
|
require 'digest/md5'
|
3
3
|
|
4
4
|
def ssh_command(command)
|
5
|
-
"ssh 2
|
5
|
+
"ssh 2>/dev/null -o BatchMode=yes -o StrictHostKeyChecking=no -tt #{@gear.uuid}@#{@app.name}-#{@account.domain}.dev.rhcloud.com " + command
|
6
6
|
end
|
7
7
|
|
8
8
|
Then /^I can run "([^\"]*)" with exit code: (\d+)$/ do |cmd, code|
|
@@ -37,18 +37,7 @@ $alias_domain = "foobar.com"
|
|
37
37
|
# Submodule repo directory for testing submodule addition test case
|
38
38
|
$submodule_repo_dir = "#{Etc.getpwuid.dir}/submodule_test_repo"
|
39
39
|
|
40
|
-
#
|
41
|
-
# Old RHC Client scripts
|
42
|
-
#
|
43
|
-
$create_app_script = "/usr/bin/rhc-create-app"
|
44
|
-
$create_domain_script = "/usr/bin/rhc-create-domain"
|
45
|
-
$ctl_app_script = "/usr/bin/rhc-ctl-app"
|
46
|
-
$user_info_script = "/usr/bin/rhc-domain-info"
|
47
|
-
$snapshot_script = "/usr/bin/rhc-snapshot"
|
48
|
-
|
49
|
-
#
|
50
|
-
# New RHC Client scripts
|
51
|
-
#
|
40
|
+
# RHC Client
|
52
41
|
$rhc_script = '/usr/bin/rhc'
|
53
42
|
|
54
43
|
# RSA Key constants
|
@@ -114,7 +114,7 @@ module CommandHelper
|
|
114
114
|
|
115
115
|
exit_code = 0
|
116
116
|
time = Benchmark.realtime do
|
117
|
-
exit_code = run("#{$rhc_script} domain create -l #{app.login} -p #{app.password}
|
117
|
+
exit_code = run("#{$rhc_script} domain create #{app.namespace} -l #{app.login} -p #{app.password} -d")
|
118
118
|
end
|
119
119
|
log_event "#{time} CREATE_DOMAIN #{app.namespace} #{app.login}"
|
120
120
|
|
@@ -160,7 +160,7 @@ module CommandHelper
|
|
160
160
|
app.snapshot="/tmp/#{app.name}-#{app.namespace}.tar.gz"
|
161
161
|
FileUtils.rm_rf app.snapshot
|
162
162
|
time = Benchmark.realtime do
|
163
|
-
run("#{$rhc_script} snapshot save
|
163
|
+
run("#{$rhc_script} snapshot save #{app.name} -f '#{app.snapshot}' -l #{app.login} -p #{app.password} -d").should == 0
|
164
164
|
end
|
165
165
|
log_event "#{time} CREATE_SNAPSHOT #{app.name} #{app.login}"
|
166
166
|
app.persist
|
@@ -175,7 +175,7 @@ module CommandHelper
|
|
175
175
|
|
176
176
|
rhc_do('rhc_restore') do
|
177
177
|
time = Benchmark.realtime do
|
178
|
-
run("#{$rhc_script} snapshot restore
|
178
|
+
run("#{$rhc_script} snapshot restore #{app.name} -f '#{app.snapshot}' -l #{app.login} -p #{app.password} -d").should == 0
|
179
179
|
end
|
180
180
|
log_event "#{time} RESTORE_SNAPSHOT #{app.name} #{app.login}"
|
181
181
|
end
|
@@ -184,7 +184,7 @@ module CommandHelper
|
|
184
184
|
def rhc_tidy(app)
|
185
185
|
rhc_do('rhc_tidy') do
|
186
186
|
time = Benchmark.realtime do
|
187
|
-
run("#{$rhc_script} app tidy
|
187
|
+
run("#{$rhc_script} app tidy #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
|
188
188
|
end
|
189
189
|
log_event "#{time} TIDY_APP #{app.name} #{app.login}"
|
190
190
|
end
|
@@ -194,7 +194,7 @@ module CommandHelper
|
|
194
194
|
rhc_sshkey_upload app
|
195
195
|
|
196
196
|
rhc_do('rhc_create_app') do
|
197
|
-
cmd = "#{$rhc_script} app create
|
197
|
+
cmd = "#{$rhc_script} app create #{app.name} #{app.type} -r #{app.repo} -l #{app.login} -p #{app.password} #{misc_opts} -d"
|
198
198
|
|
199
199
|
# Short circuit DNS to speed up the tests by adding a host entry and skipping the DNS validation
|
200
200
|
if use_hosts
|
@@ -235,7 +235,7 @@ module CommandHelper
|
|
235
235
|
rhc_do('rhc_embed_add') do
|
236
236
|
result = nil
|
237
237
|
time = Benchmark.realtime do
|
238
|
-
result = run_stdout("#{$rhc_script} cartridge add
|
238
|
+
result = run_stdout("#{$rhc_script} cartridge add #{type} -a #{app.name} -l #{app.login} -p #{app.password} -d")
|
239
239
|
end
|
240
240
|
$logger.info { "Embed #{type} into #{app.inspect}: OUTPUT\n<<#{result}>>\n" }
|
241
241
|
log_event "#{time} ADD_EMBED_CART #{app.name} #{type} #{app.login}"
|
@@ -269,7 +269,7 @@ module CommandHelper
|
|
269
269
|
rhc_do('rhc_embed_remove') do
|
270
270
|
# puts app.name
|
271
271
|
time = Benchmark.realtime do
|
272
|
-
run("#{$rhc_script} cartridge remove
|
272
|
+
run("#{$rhc_script} cartridge remove #{type} -a #{app.name} --confirm -l #{app.login} -p #{app.password} -d").should == 0
|
273
273
|
end
|
274
274
|
log_event "#{time} REMOVE_EMBED_CART #{app.name} #{type} #{app.login}"
|
275
275
|
app.mysql_hostname = nil
|
@@ -285,11 +285,11 @@ module CommandHelper
|
|
285
285
|
def rhc_ctl_stop(app)
|
286
286
|
rhc_do('rhc_ctl_stop') do
|
287
287
|
time = Benchmark.realtime do
|
288
|
-
run("#{$rhc_script} app stop -l #{app.login} -p #{app.password}
|
288
|
+
run("#{$rhc_script} app stop #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
|
289
289
|
end
|
290
290
|
log_event "#{time} STOP_APP #{app.name} #{app.login}"
|
291
291
|
time = Benchmark.realtime do
|
292
|
-
run("#{$rhc_script} app show
|
292
|
+
run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep '#{app.get_stop_string}'").should == 0
|
293
293
|
end
|
294
294
|
log_event "#{time} STATUS_APP #{app.name} #{app.login}"
|
295
295
|
end
|
@@ -298,7 +298,7 @@ module CommandHelper
|
|
298
298
|
def rhc_add_alias(app)
|
299
299
|
rhc_do('rhc_add_alias') do
|
300
300
|
time = Benchmark.realtime do
|
301
|
-
run("#{$rhc_script} alias add
|
301
|
+
run("#{$rhc_script} alias add #{app.name} '#{app.name}-#{app.namespace}.#{$alias_domain}' -l #{app.login} -p #{app.password} -d").should == 0
|
302
302
|
end
|
303
303
|
log_event "#{time} ADD_ALIAS #{app.name} #{app.login}"
|
304
304
|
end
|
@@ -307,7 +307,7 @@ module CommandHelper
|
|
307
307
|
def rhc_remove_alias(app)
|
308
308
|
rhc_do('rhc_remove_alias') do
|
309
309
|
time = Benchmark.realtime do
|
310
|
-
run("#{$rhc_script} alias remove
|
310
|
+
run("#{$rhc_script} alias remove #{app.name} '#{app.name}-#{app.namespace}.#{$alias_domain}' -l #{app.login} -p #{app.password} -d").should == 0
|
311
311
|
end
|
312
312
|
log_event "#{time} REMOVE_ALIAS #{app.name} #{app.login}"
|
313
313
|
end
|
@@ -316,11 +316,11 @@ module CommandHelper
|
|
316
316
|
def rhc_ctl_start(app)
|
317
317
|
rhc_do('rhc_ctl_start') do
|
318
318
|
time = Benchmark.realtime do
|
319
|
-
run("#{$rhc_script} app start -l #{app.login} -p #{app.password}
|
319
|
+
run("#{$rhc_script} app start #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
|
320
320
|
end
|
321
321
|
log_event "#{time} START_APP #{app.name} #{app.login}"
|
322
322
|
time = Benchmark.realtime do
|
323
|
-
run("#{$rhc_script} app show
|
323
|
+
run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep '#{app.get_stop_string}'").should == 1
|
324
324
|
end
|
325
325
|
log_event "#{time} STATUS_APP #{app.name} #{app.login}"
|
326
326
|
end
|
@@ -329,11 +329,11 @@ module CommandHelper
|
|
329
329
|
def rhc_ctl_restart(app)
|
330
330
|
rhc_do('rhc_ctl_restart') do
|
331
331
|
time = Benchmark.realtime do
|
332
|
-
run("#{$rhc_script} app restart -l #{app.login} -p #{app.password}
|
332
|
+
run("#{$rhc_script} app restart #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
|
333
333
|
end
|
334
334
|
log_event "#{time} RESTART_APP #{app.name} #{app.login}"
|
335
335
|
time = Benchmark.realtime do
|
336
|
-
run("#{$rhc_script} app show
|
336
|
+
run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep '#{app.get_stop_string}'").should == 1
|
337
337
|
end
|
338
338
|
log_event "#{time} STATUS_APP #{app.name} #{app.login}"
|
339
339
|
end
|
@@ -342,11 +342,11 @@ module CommandHelper
|
|
342
342
|
def rhc_ctl_destroy(app, use_hosts=true)
|
343
343
|
rhc_do('rhc_ctl_destroy') do
|
344
344
|
time = Benchmark.realtime do
|
345
|
-
run("#{$rhc_script} app delete -l #{app.login} -p #{app.password}
|
345
|
+
run("#{$rhc_script} app delete #{app.name} -l #{app.login} -p #{app.password} --confirm -d").should == 0
|
346
346
|
end
|
347
347
|
log_event "#{time} DESTROY_APP #{app.name} #{app.login}"
|
348
348
|
time = Benchmark.realtime do
|
349
|
-
run("#{$rhc_script} app show
|
349
|
+
run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep 'does not exist'").should == 0
|
350
350
|
end
|
351
351
|
log_event "#{time} STATUS_APP #{app.name} #{app.login}"
|
352
352
|
run("sed -i '/#{app.name}-#{app.namespace}.#{$domain}/d' /etc/hosts") if use_hosts
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: openshift-origin-controller
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 19
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 3
|
9
|
-
-
|
10
|
-
version: 1.3.
|
9
|
+
- 4
|
10
|
+
version: 1.3.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Krishna Raman
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2013-01-
|
18
|
+
date: 2013-01-14 00:00:00 -05:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|