openshift-origin-controller 1.3.2 → 1.3.3

data/app/models/cartridge_cache.rb

@@ -26,7 +26,7 @@ class CartridgeCache
   FRAMEWORK_CART_NAMES = [#RHEL6 cartridges
                           "python-2.6", "jenkins-1.4", "ruby-1.8", "ruby-1.9",
                           "diy-0.1", "php-5.3", "jbossas-7", "jbosseap-6.0", "jbossews-1.0",
-                          "perl-5.10", "nodejs-0.6", "zend-5.6",
+                          "jbossews-2.0", "perl-5.10", "nodejs-0.6", "zend-5.6",
                          ]
   def self.cartridge_names(cart_type=nil)
     cart_names = cartridges.map{|c| c.name}

data/rubygem-openshift-origin-controller.spec

@@ -9,7 +9,7 @@
 
 Summary:        Cloud Development Controller
 Name:           rubygem-%{gem_name}
-Version: 1.3.2
+Version: 1.3.3
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
@@ -79,6 +79,18 @@ mkdir -p %{buildroot}/etc/openshift/
 %{gem_dir}/doc/%{gem_name}-%{version}
 
 %changelog
+* 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
+  (dmcphers+openshiftbot@redhat.com)
+- updated ews2 tests (bdecoste@gmail.com)
+- Fix BZ892006: Make postgresql socket file access solvent and add tests for
+  postgres and mysql socket files. (pmorie@gmail.com)
+- added ews2 tests (bdecoste@gmail.com)
+- Refactor to use env var rather than output from hook (jhonce@redhat.com)
+- Merge pull request #1083 from bdecoste/master (openshift+bot@redhat.com)
+- re-enabed ews2 (bdecoste@gmail.com)
+
 * Tue Dec 18 2012 Adam Miller <admiller@redhat.com> 1.3.2-1
 - - oo-setup-broker fixes:   - Open dns ports for access to DNS server from
   outside the VM   - Turn on SELinux booleans only if they are off (Speeds up

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

@@ -0,0 +1,61 @@
+@runtime_extended
+@runtime_extended2
+@not-origin
+Feature: Cartridge Lifecycle JBossEWS2.0 Verification Tests
+  Scenario Outline: Application Creation
+    Given the libra client tools
+    And an accepted node
+    When <app_count> <type> applications are created
+    Then the applications should be accessible
+
+  Scenarios: Application Creation Scenarios
+    | app_count |     type     |
+    |     1     |  jbossews-2.0   |
+    
+  Scenario Outline: Application Modification
+    Given an existing <type> application
+    When the application is changed
+    Then it should be updated successfully
+    And the application should be accessible
+
+  Scenarios: Application Modification Scenarios
+    |      type     |
+    |   jbossews-2.0   |
+    
+  Scenario Outline: Application Restarting
+    Given an existing <type> application
+    When the application is restarted
+    Then the application should be accessible
+
+  Scenarios: Application Restart Scenarios
+    |      type     |
+    |   jbossews-2.0   |
+    
+  Scenario Outline: Application Tidy
+    Given an existing <type> application
+    When I tidy the application
+    Then the application should be accessible
+
+  Scenarios: Application Tidy Scenarios
+    |      type     |
+    |   jbossews-2.0   |
+    
+  Scenario Outline: Application Snapshot
+    Given an existing <type> application
+    When I snapshot the application
+    Then the application should be accessible
+    When I restore the application
+    Then the application should be accessible
+
+  Scenarios: Application Snapshot Scenarios
+    |      type     |
+    |   jbossews-2.0   |
+
+  Scenario Outline: Application Destroying
+    Given an existing <type> application
+    When the application is destroyed
+    Then the application should not be accessible
+
+  Scenarios: Application Destroying Scenarios
+    |      type     |
+    |   jbossews-2.0   |

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

@@ -0,0 +1,10 @@
+@runtime_extended3
+Feature: Mysql extended tests
+  
+  Scenario: Use socket file to connect to database 
+    Given a new php-5.3 type application
+    And I embed a mysql-5.1 cartridge into the application
+    And the application is made publicly accessible
+
+    When I select from the mysql database using the socket file
+    Then the select result from the mysql database should be valid

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

@@ -0,0 +1,10 @@
+@runtime_extended3
+Feature: Postgresql extended tests
+  
+  Scenario: Use socket file to connect to database 
+    Given a new php-5.3 type application
+    And I embed a postgresql-8.4 cartridge into the application
+    And the application is made publicly accessible
+
+    When I select from the postgresql database using the socket file
+    Then the select result from the postgresql database should be valid

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

@@ -1,7 +1,7 @@
 @runtime
 @not-origin
-Feature: Cartridge Runtime Standard Checks (JBoss EWS2.0)
+Feature: Cartridge Runtime Standard Checks (JBoss EWS1.0)
 
   @runtime2
-  Scenario: JBoss EWS2.0 cartridge checks
+  Scenario: JBoss EWS1.0 cartridge checks
     Given a new jbossews-1.0 application, verify it using java

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

@@ -0,0 +1,7 @@
+@runtime
+@not-origin
+Feature: Cartridge Runtime Standard Checks (JBoss EWS2.0)
+
+  @runtime2
+  Scenario: JBoss EWS2.0 cartridge checks
+    Given a new jbossews-2.0 application, verify it using java

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=120')
+      @diy_app = rhc_create_app(@app, false, '--enable-jenkins --timeout=240')
       @diy_app.create_app_code.should be == 0
     else
       raise "Failed to create domain: #{@app}"

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

@@ -0,0 +1,14 @@
+When /^I select from the mysql database using the socket file$/ do
+  cmd = ssh_command("-o LogLevel=quiet \"/usr/bin/mysql -S \\$OPENSHIFT_MYSQL_DB_SOCKET -u \\$OPENSHIFT_MYSQL_DB_USERNAME --password=\\$OPENSHIFT_MYSQL_DB_PASSWORD --batch --silent --execute='select 1'\"") 
+
+  $logger.debug "Running #{cmd}"
+
+  output = `#{cmd}`
+  @mysql_query_result = output.strip
+
+  $logger.debug "Output: #{output}"
+end
+
+Then /^the select result from the mysql database should be valid$/ do
+  @mysql_query_result.should be == "1"
+end

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

@@ -0,0 +1,14 @@
+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\"")
+
+  $logger.debug "Running #{cmd}"
+
+  output = `#{cmd}`
+  @postgresql_query_result = output.strip
+
+  $logger.debug "Output: #{output}"
+end
+
+Then /^the select result from the postgresql database should be valid$/ do
+  @postgresql_query_result.should be == "1"
+end

data/test/cucumber/support/app_helper.rb

@@ -133,6 +133,7 @@ jenkins_build = #{@jenkins_build}
         when "jbossas-7" then "src/main/webapp/index.html"
         when "jbosseap-6.0" then "src/main/webapp/index.html"
         when "jbossews-1.0" then "src/main/webapp/index.html"
+        when "jbossews-2.0" then "src/main/webapp/index.html"
         when "nodejs-0.6" then "index.html"
       end
     end

data/test/cucumber/support/command_helper.rb

@@ -5,6 +5,10 @@ require 'open4'
 require 'benchmark'
 
 module CommandHelper
+  def getenv(uuid, var)
+    run_stdout("source /var/lib/openshift/#{uuid}/.env/#{var};echo $#{var}").chomp!
+  end
+
   def run_stdout(cmd)
     $logger.info("Running: #{cmd}")
 
@@ -233,7 +237,7 @@ module CommandHelper
       time = Benchmark.realtime do 
         result = run_stdout("#{$rhc_script} cartridge add -l #{app.login} -a #{app.name} -p #{app.password} -c #{type} -d")
       end
-      $logger.info { "Embed #{type} into #{app.inspect}: OUTPUT\n#{result}" }
+      $logger.info { "Embed #{type} into #{app.inspect}: OUTPUT\n<<#{result}>>\n" }
       log_event "#{time} ADD_EMBED_CART #{app.name} #{type} #{app.login}"
       if type.start_with?('mysql-')
         # Recent versions of rhc now return a connection URL in this format:
@@ -244,14 +248,10 @@ module CommandHelper
         # directory to get the actual values to attach to the app.
 
         # Source the env var values from the gear directory
-        host_val = `source /var/lib/openshift/#{app.uid}/.env/OPENSHIFT_MYSQL_DB_HOST;echo $OPENSHIFT_MYSQL_DB_HOST`.chomp!
-        port_val = `source /var/lib/openshift/#{app.uid}/.env/OPENSHIFT_MYSQL_DB_PORT;echo $OPENSHIFT_MYSQL_DB_PORT`.chomp!
-
-        # Assign the hostname ourselves, in host:port format
-        app.mysql_hostname = "#{host_val}:#{port_val}"
-        app.mysql_user = /Username\s*=\s*(\S+)/.match(result)[1]
-        app.mysql_password = /Password\s*=\s*(\S+)/.match(result)[1]
-        app.mysql_database = /Database Name\s*=\s*(\S+)/.match(result)[1]
+        app.mysql_hostname = getenv(app.uid, 'OPENSHIFT_MYSQL_DB_HOST')
+        app.mysql_user     = getenv(app.uid, 'OPENSHIFT_MYSQL_DB_USERNAME')
+        app.mysql_password = getenv(app.uid, 'OPENSHIFT_MYSQL_DB_PASSWORD')
+        app.mysql_database = getenv(app.uid, 'OPENSHIFT_APP_NAME')
 
         app.mysql_hostname.should_not be_nil
         app.mysql_user.should_not be_nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openshift-origin-controller
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Krishna Raman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-18 00:00:00 -05:00
+date: 2013-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -339,8 +339,10 @@ files:
 - test/cucumber/step_definitions/cartridge-cron_steps.rb
 - test/cucumber/step_definitions/api_steps.rb
 - test/cucumber/step_definitions/cartridge-postgresql_steps.rb
+- test/cucumber/step_definitions/cartridge-postgresql-extended_steps.rb
 - test/cucumber/step_definitions/application-estimate-steps.rb
 - test/cucumber/step_definitions/idler_steps.rb
+- test/cucumber/step_definitions/cartridge-mysql-extended_steps.rb
 - test/cucumber/step_definitions/trap-user_steps.rb
 - test/cucumber/step_definitions/cartridge-switchyard_steps.rb
 - test/cucumber/step_definitions/cartridge-jenkins_steps.rb
@@ -357,8 +359,10 @@ files:
 - test/cucumber/cartridge-postgresql.feature
 - test/cucumber/cartridge-runtime-standard-jbosseap.feature
 - test/cucumber/embedded.feature
+- test/cucumber/cartridge-runtime-extended-postgresql.feature
 - test/cucumber/cartridge-runtime-standard-jbossews10.feature
 - test/cucumber/cartridge-lifecycle-jenkins.feature
+- test/cucumber/cartridge-runtime-extended-mysql.feature
 - test/cucumber/cartridge-phpmyadmin.feature
 - test/cucumber/application-estimate.feature
 - test/cucumber/cartridge-lifecycle-python.feature
@@ -379,12 +383,14 @@ files:
 - test/cucumber/support/command_helper.rb
 - test/cucumber/support/unused.rb
 - test/cucumber/support/env.rb
+- test/cucumber/cartridge-runtime-standard-jbossews20.feature
 - test/cucumber/cartridge-lifecycle-ruby18.feature
 - test/cucumber/rest-applications.feature
 - test/cucumber/trap-user.feature
 - test/cucumber/rest-quickstarts.feature
 - test/cucumber/cartridge-runtime-extended-python.feature
 - test/cucumber/cartridge-lifecycle-nodejs.feature
+- test/cucumber/cartridge-lifecycle-jbossews20.feature
 - test/cucumber/cartridge-runtime-standard-perl.feature
 - test/cucumber/cartridge-runtime-extended-db.feature
 - test/cucumber/rest-workflow.feature
@@ -485,8 +491,10 @@ test_files:
 - test/cucumber/step_definitions/cartridge-cron_steps.rb
 - test/cucumber/step_definitions/api_steps.rb
 - test/cucumber/step_definitions/cartridge-postgresql_steps.rb
+- test/cucumber/step_definitions/cartridge-postgresql-extended_steps.rb
 - test/cucumber/step_definitions/application-estimate-steps.rb
 - test/cucumber/step_definitions/idler_steps.rb
+- test/cucumber/step_definitions/cartridge-mysql-extended_steps.rb
 - test/cucumber/step_definitions/trap-user_steps.rb
 - test/cucumber/step_definitions/cartridge-switchyard_steps.rb
 - test/cucumber/step_definitions/cartridge-jenkins_steps.rb
@@ -503,8 +511,10 @@ test_files:
 - test/cucumber/cartridge-postgresql.feature
 - test/cucumber/cartridge-runtime-standard-jbosseap.feature
 - test/cucumber/embedded.feature
+- test/cucumber/cartridge-runtime-extended-postgresql.feature
 - test/cucumber/cartridge-runtime-standard-jbossews10.feature
 - test/cucumber/cartridge-lifecycle-jenkins.feature
+- test/cucumber/cartridge-runtime-extended-mysql.feature
 - test/cucumber/cartridge-phpmyadmin.feature
 - test/cucumber/application-estimate.feature
 - test/cucumber/cartridge-lifecycle-python.feature
@@ -525,12 +535,14 @@ test_files:
 - test/cucumber/support/command_helper.rb
 - test/cucumber/support/unused.rb
 - test/cucumber/support/env.rb
+- test/cucumber/cartridge-runtime-standard-jbossews20.feature
 - test/cucumber/cartridge-lifecycle-ruby18.feature
 - test/cucumber/rest-applications.feature
 - test/cucumber/trap-user.feature
 - test/cucumber/rest-quickstarts.feature
 - test/cucumber/cartridge-runtime-extended-python.feature
 - test/cucumber/cartridge-lifecycle-nodejs.feature
+- test/cucumber/cartridge-lifecycle-jbossews20.feature
 - test/cucumber/cartridge-runtime-standard-perl.feature
 - test/cucumber/cartridge-runtime-extended-db.feature
 - test/cucumber/rest-workflow.feature