openshift-origin-controller 1.3.3 → 1.3.4

data/rubygem-openshift-origin-controller.spec

@@ -9,7 +9,7 @@
 
 Summary:        Cloud Development Controller
 Name:           rubygem-%{gem_name}
-Version: 1.3.3
+Version: 1.3.4
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
@@ -79,6 +79,22 @@ mkdir -p %{buildroot}/etc/openshift/
 %{gem_dir}/doc/%{gem_name}-%{version}
 
 %changelog
+* Mon Jan 14 2013 Adam Miller <admiller@redhat.com> 1.3.4-1
+- Merge pull request #1145 from bdecoste/master
+  (dmcphers+openshiftbot@redhat.com)
+- Merge pull request #1146 from pmorie/bugs/fix-tests2
+  (dmcphers+openshiftbot@redhat.com)
+- increase jenkins creation timeout (bdecoste@gmail.com)
+- Fix failing socket file tests (pmorie@gmail.com)
+- Merge pull request #916 from Miciah/devenv-fixes-2
+  (dmcphers+openshiftbot@redhat.com)
+- Merge pull request #1142 from bdecoste/master
+  (dmcphers+openshiftbot@redhat.com)
+- kill orphan jenkins process (bdecoste@gmail.com)
+- harden JSON parsing for jenkins test (bdecoste@gmail.com)
+- Add @not-enterprise tag to some tests (miciah.masters@gmail.com)
+- Fix tests to use newer-style rhc invocations (miciah.masters@gmail.com)
+
 * Thu Jan 10 2013 Adam Miller <admiller@redhat.com> 1.3.3-1
 - increased jenkins test timeout (bdecoste@gmail.com)
 - Merge pull request #1134 from bdecoste/master

data/test/cucumber/cartridge-10gen-mms-agent.feature

@@ -1,5 +1,6 @@
 @runtime
 @runtime1
+@not-enterprise
 Feature: 10gen-mms-agent Embedded Cartridge
 
   Scenario: Add Remove 10gen-mms-agent to one application

data/test/cucumber/cartridge-lifecycle-nodejs.feature

@@ -1,6 +1,7 @@
 @runtime_extended
 @runtime_extended3
 @not-origin
+@not-enterprise
 Feature: Cartridge Lifecycle NodeJS Verification Tests
   Scenario Outline: Application Creation
     Given the libra client tools

data/test/cucumber/cartridge-lifecycle-php.feature

@@ -1,5 +1,6 @@
 @runtime
 @runtime4
+@not-enterprise
 Feature: Cartridge Lifecycle PHP Verification Tests
   Scenario Outline: Application Creation
     Given the libra client tools

data/test/cucumber/cartridge-lifecycle-ruby18.feature

@@ -1,5 +1,6 @@
 @runtime
 @runtime1
+@not-enterprise
 Feature: Cartridge Lifecycle Ruby Verification Tests
   Scenario Outline: Application Creation
     Given the libra client tools

data/test/cucumber/cartridge-mongodb.feature

@@ -1,5 +1,6 @@
 @runtime
 @runtime1
+@not-enterprise
 Feature: MongoDB Application Sub-Cartridge
   
   Scenario: Create Delete one application with a MongoDB database

data/test/cucumber/cartridge-phpmyadmin.feature

@@ -1,5 +1,6 @@
 @runtime
 @runtime4
+@not-enterprise
 Feature: phpMyAdmin Embedded Cartridge
 
   Scenario: Add Remove phpMyAdmin to one application

data/test/cucumber/cartridge-runtime-extended-nodejs.feature

@@ -1,5 +1,6 @@
 @runtime
 @not-origin
+@not-enterprise
 Feature: Cartridge Runtime Extended Checks (Node)
 
   @runtime_extended2

data/test/cucumber/cartridge-runtime-standard-nodejs.feature

@@ -1,5 +1,6 @@
 @runtime
 @not-origin
+@not-enterprise
 Feature: Cartridge Runtime Standard Checks (Node)
 
   @runtime1

data/test/cucumber/step_definitions/cartridge-jenkins_steps.rb

@@ -14,7 +14,7 @@ When /^I configure a hello_world diy application with jenkins enabled$/ do
 
     register_user(@app.login, @app.password) if $registration_required
     if rhc_create_domain(@app)
-      @diy_app = rhc_create_app(@app, false, '--enable-jenkins --timeout=240')
+      @diy_app = rhc_create_app(@app, false, '--enable-jenkins --timeout=300')
       @diy_app.create_app_code.should be == 0
     else
       raise "Failed to create domain: #{@app}"
@@ -77,6 +77,8 @@ Then /^the application will be updated$/ do
         $logger.debug "@jenkins_build response = #{response}"
 
         job = JSON.parse(response)
+      rescue => e
+        $logger.warn "Unexpected exception checking update: #{e.message}\n#{e.backtrace.join("\n")}"
       end while job['color'] != 'blue'
     end
     job['color'].should be == 'blue' 
@@ -90,4 +92,6 @@ end
 
 Then /^I deconfigure the diy application with jenkins enabled$/ do
     rhc_ctl_destroy(@app, false)
+    @app.name='jenkins'
+    rhc_ctl_destroy(@app, false)
 end

data/test/cucumber/step_definitions/cartridge-postgresql-extended_steps.rb

@@ -1,5 +1,5 @@
 When /^I select from the postgresql database using the socket file$/ do
-  cmd = ssh_command("-o LogLevel=quiet \"PGPASSWORD=\\$OPENSHIFT_POSTGRESQL_DB_PASSWORD /usr/bin/psql -U admin -h \\$OPENSHIFT_POSTGRESQL_DB_SOCKET -d #{@app.name} -c 'select 1' -t\"")
+  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\"")
 
   $logger.debug "Running #{cmd}"
 

data/test/cucumber/step_definitions/client_steps.rb

@@ -3,10 +3,6 @@ Given /^an accepted node$/ do
 end
 
 Given /^the libra client tools$/ do
-  File.exists?($create_app_script).should be_true
-  File.exists?($create_domain_script).should be_true
   File.exists?($client_config).should be_true
-  File.exists?($ctl_app_script).should be_true
-
   File.exists?($rhc_script).should be_true
-end
+end

data/test/cucumber/step_definitions/trap-user_steps.rb

@@ -2,7 +2,7 @@ require 'pty'
 require 'digest/md5'
 
 def ssh_command(command) 
-  "ssh 2>&1 -o BatchMode=yes -o StrictHostKeyChecking=no -t #{@gear.uuid}@#{@app.name}-#{@account.domain}.dev.rhcloud.com " + command
+  "ssh 2>/dev/null -o BatchMode=yes -o StrictHostKeyChecking=no -tt #{@gear.uuid}@#{@app.name}-#{@account.domain}.dev.rhcloud.com " + command
 end
 
 Then /^I can run "([^\"]*)" with exit code: (\d+)$/ do |cmd, code|

data/test/cucumber/support/00_setup_helper.rb

@@ -37,18 +37,7 @@ $alias_domain = "foobar.com"
 # Submodule repo directory for testing submodule addition test case
 $submodule_repo_dir = "#{Etc.getpwuid.dir}/submodule_test_repo"
 
-#
-# Old RHC Client scripts
-#
-$create_app_script = "/usr/bin/rhc-create-app"
-$create_domain_script = "/usr/bin/rhc-create-domain"
-$ctl_app_script = "/usr/bin/rhc-ctl-app"
-$user_info_script = "/usr/bin/rhc-domain-info"
-$snapshot_script = "/usr/bin/rhc-snapshot"
-
-#
-# New RHC Client scripts
-#
+# RHC Client
 $rhc_script = '/usr/bin/rhc'
 
 # RSA Key constants

data/test/cucumber/support/command_helper.rb

@@ -114,7 +114,7 @@ module CommandHelper
 
       exit_code = 0
       time = Benchmark.realtime do 
-        exit_code = run("#{$rhc_script} domain create -l #{app.login} -p #{app.password} #{app.namespace} -d")
+        exit_code = run("#{$rhc_script} domain create #{app.namespace} -l #{app.login} -p #{app.password} -d")
       end
       log_event "#{time} CREATE_DOMAIN #{app.namespace} #{app.login}"
 
@@ -160,7 +160,7 @@ module CommandHelper
       app.snapshot="/tmp/#{app.name}-#{app.namespace}.tar.gz"
       FileUtils.rm_rf app.snapshot
       time = Benchmark.realtime do 
-        run("#{$rhc_script} snapshot save -l #{app.login} -p #{app.password} --app #{app.name} -f '#{app.snapshot}' -d").should == 0
+        run("#{$rhc_script} snapshot save #{app.name} -f '#{app.snapshot}' -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} CREATE_SNAPSHOT #{app.name} #{app.login}"
       app.persist
@@ -175,7 +175,7 @@ module CommandHelper
 
     rhc_do('rhc_restore') do
       time = Benchmark.realtime do 
-        run("#{$rhc_script} snapshot restore -l #{app.login} -p #{app.password} --app #{app.name} -f '#{app.snapshot}' -d").should == 0
+        run("#{$rhc_script} snapshot restore #{app.name} -f '#{app.snapshot}' -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} RESTORE_SNAPSHOT #{app.name} #{app.login}"
     end
@@ -184,7 +184,7 @@ module CommandHelper
   def rhc_tidy(app)
     rhc_do('rhc_tidy') do
       time = Benchmark.realtime do
-        run("#{$rhc_script} app tidy -l #{app.login} -a #{app.name} -p #{app.password} -d").should == 0
+        run("#{$rhc_script} app tidy #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} TIDY_APP #{app.name} #{app.login}"
     end
@@ -194,7 +194,7 @@ module CommandHelper
     rhc_sshkey_upload app
 
     rhc_do('rhc_create_app') do
-      cmd = "#{$rhc_script} app create -l #{app.login} -a #{app.name} -r #{app.repo} -t #{app.type} -p #{app.password} #{misc_opts} -d"
+      cmd = "#{$rhc_script} app create #{app.name} #{app.type} -r #{app.repo} -l #{app.login} -p #{app.password} #{misc_opts} -d"
 
       # Short circuit DNS to speed up the tests by adding a host entry and skipping the DNS validation
       if use_hosts
@@ -235,7 +235,7 @@ module CommandHelper
     rhc_do('rhc_embed_add') do
       result = nil
       time = Benchmark.realtime do 
-        result = run_stdout("#{$rhc_script} cartridge add -l #{app.login} -a #{app.name} -p #{app.password} -c #{type} -d")
+        result = run_stdout("#{$rhc_script} cartridge add #{type} -a #{app.name} -l #{app.login} -p #{app.password} -d")
       end
       $logger.info { "Embed #{type} into #{app.inspect}: OUTPUT\n<<#{result}>>\n" }
       log_event "#{time} ADD_EMBED_CART #{app.name} #{type} #{app.login}"
@@ -269,7 +269,7 @@ module CommandHelper
     rhc_do('rhc_embed_remove') do
       # puts app.name
       time = Benchmark.realtime do 
-        run("#{$rhc_script} cartridge remove -l #{app.login} -a #{app.name} -p #{app.password} -c #{type} --confirm -d").should == 0
+        run("#{$rhc_script} cartridge remove #{type} -a #{app.name} --confirm -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} REMOVE_EMBED_CART #{app.name} #{type} #{app.login}"
       app.mysql_hostname = nil
@@ -285,11 +285,11 @@ module CommandHelper
   def rhc_ctl_stop(app)
     rhc_do('rhc_ctl_stop') do
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app stop -l #{app.login} -p #{app.password} #{app.name} -d").should == 0
+        run("#{$rhc_script} app stop #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} STOP_APP #{app.name} #{app.login}"
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app show -l #{app.login} -p #{app.password} #{app.name} --state | grep '#{app.get_stop_string}'").should == 0
+        run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep '#{app.get_stop_string}'").should == 0
       end
       log_event "#{time} STATUS_APP #{app.name} #{app.login}"
     end
@@ -298,7 +298,7 @@ module CommandHelper
   def rhc_add_alias(app)
     rhc_do('rhc_add_alias') do
       time = Benchmark.realtime do 
-        run("#{$rhc_script} alias add -l #{app.login} -p #{app.password} #{app.name} '#{app.name}-#{app.namespace}.#{$alias_domain}' -d").should == 0
+        run("#{$rhc_script} alias add #{app.name} '#{app.name}-#{app.namespace}.#{$alias_domain}' -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} ADD_ALIAS #{app.name} #{app.login}"
     end
@@ -307,7 +307,7 @@ module CommandHelper
   def rhc_remove_alias(app)
     rhc_do('rhc_remove_alias') do
       time = Benchmark.realtime do 
-        run("#{$rhc_script} alias remove -l #{app.login} -p #{app.password} #{app.name} '#{app.name}-#{app.namespace}.#{$alias_domain}' -d").should == 0
+        run("#{$rhc_script} alias remove #{app.name} '#{app.name}-#{app.namespace}.#{$alias_domain}' -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} REMOVE_ALIAS #{app.name} #{app.login}"
     end
@@ -316,11 +316,11 @@ module CommandHelper
   def rhc_ctl_start(app)
     rhc_do('rhc_ctl_start') do
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app start -l #{app.login} -p #{app.password} #{app.name} -d").should == 0
+        run("#{$rhc_script} app start #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} START_APP #{app.name} #{app.login}"
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app show -l #{app.login} -p #{app.password} #{app.name} --state | grep '#{app.get_stop_string}'").should == 1
+        run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep '#{app.get_stop_string}'").should == 1
       end
       log_event "#{time} STATUS_APP #{app.name} #{app.login}"
     end
@@ -329,11 +329,11 @@ module CommandHelper
   def rhc_ctl_restart(app)
     rhc_do('rhc_ctl_restart') do
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app restart -l #{app.login} -p #{app.password} #{app.name} -d").should == 0
+        run("#{$rhc_script} app restart #{app.name} -l #{app.login} -p #{app.password} -d").should == 0
       end
       log_event "#{time} RESTART_APP #{app.name} #{app.login}"
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app show -l #{app.login} -p #{app.password} #{app.name} --state | grep '#{app.get_stop_string}'").should == 1
+        run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep '#{app.get_stop_string}'").should == 1
       end
       log_event "#{time} STATUS_APP #{app.name} #{app.login}"
     end
@@ -342,11 +342,11 @@ module CommandHelper
   def rhc_ctl_destroy(app, use_hosts=true)
     rhc_do('rhc_ctl_destroy') do
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app delete -l #{app.login} -p #{app.password} #{app.name} --confirm -d").should == 0
+        run("#{$rhc_script} app delete #{app.name} -l #{app.login} -p #{app.password} --confirm -d").should == 0
       end
       log_event "#{time} DESTROY_APP #{app.name} #{app.login}"
       time = Benchmark.realtime do 
-        run("#{$rhc_script} app show -l #{app.login} -p #{app.password} #{app.name} --state | grep 'does not exist'").should == 0
+        run("#{$rhc_script} app show --state #{app.name} -l #{app.login} -p #{app.password} | grep 'does not exist'").should == 0
       end
       log_event "#{time} STATUS_APP #{app.name} #{app.login}"
       run("sed -i '/#{app.name}-#{app.namespace}.#{$domain}/d' /etc/hosts") if use_hosts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openshift-origin-controller
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Krishna Raman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-10 00:00:00 -05:00
+date: 2013-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency