Add @smoke tag to a subset of BVTs for faster execution

Change-Id: I94729d733a7b640257f654a22b5d30169ff75cf4
georgiko · Oct 25, 2011 · 16080a8 · 16080a8
1 parent 152c84c
commit 16080a8
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 11 deletions.
diff --git a/Rakefile b/Rakefile
@@ -13,6 +13,9 @@ import "#{vcap}/rakelib/bundler.rake"
 desc "Run the Basic Viability Tests"
 task :tests => ['build','bvt:run']
 
+desc "Run a faster subset of Basic Viability Tests"
+task :smoke_tests => ['build','bvt:run_smoke']
+
 ci_steps = ['ci:version_check',
             'build',
             'bundler:install:production',

diff --git a/features/application_info.feature b/features/application_info.feature
@@ -1,3 +1,4 @@
+@smoke
 Feature: Retrieve information on an application on AppCloud
 
 	 As a user with an application deployed on AppCloud

diff --git a/features/application_lifecycle_control.feature b/features/application_lifecycle_control.feature
@@ -1,3 +1,4 @@
+@smoke
 Feature: Control the life-cycle of an application on AppCloud
 
   As a user of AppCloud

diff --git a/features/application_performance.feature b/features/application_performance.feature
@@ -6,7 +6,7 @@ Feature: Measure various performance features of an application
 	 Background: Application creation
 	   Given I have registered and logged in
 
-       @creates_redis_lb_app @lb_check
+       @creates_redis_lb_app @lb_check @smoke
        Scenario: start application
          Given I have my redis lb app on AppCloud
          When I upload my application
@@ -29,7 +29,7 @@ Feature: Measure various performance features of an application
 		 And all 5 instances should do within 55 percent of their fair share of the 150 operations
 		 And after resetting all counters it should return OK and no data
 
-      @creates_env_test_app @env_test_check
+      @creates_env_test_app @env_test_check @smoke
       Scenario: start application
         Given I have my env_test app on AppCloud
         When I upload my application
@@ -48,6 +48,7 @@ Feature: Measure various performance features of an application
         Then it should be bound to an atmos service
         And env_test's health_check entrypoint should return OK
 
+      @smoke
       Scenario: start application
         Given The appcloud instance has a set of available frameworks
         Given The foo framework is not supported on appcloud

diff --git a/features/application_update.feature b/features/application_update.feature
@@ -7,18 +7,18 @@ Feature: Update an application on AppCloud
      Given I have registered and logged in
      And I have deployed a simple application
 
-     @creates_simple_app
+     @creates_simple_app @smoke
      Scenario: increase instance count
          When I increase the instance count of my application by 2
          Then I should have 3 instances of my application
 
-     @creates_simple_app
+     @creates_simple_app @smoke
      Scenario: decrease instance count
          When I increase the instance count of my application by 2
          And I decrease the instance count of my application by 1
          Then I should have 2 instances of my application
 
-     @creates_simple_app
+     @creates_simple_app @smoke
      Scenario: add a url for the application to respond to
          When I add a url to my application
          Then I should have 2 urls associated with my application
@@ -32,23 +32,23 @@ Feature: Update an application on AppCloud
          And I should be able to access the application through the original url.
          And I should be able to access the application through the new url.
 
-     @creates_simple_app
+     @creates_simple_app @smoke
      Scenario: remove a url that the application responds to
          Given I have my application associated with '2' urls
          When I remove one of the urls associated with my application
          Then I should have 1 urls associated with my application
          And I should be able to access the application through the remaining url.
          And I should be not be able to access the application through the removed url.
 
-     @creates_simple_app
+     @creates_simple_app @smoke
      Scenario: change url that the application responds to
          When I add a url to my application
          And I remove the original url associated with my application
          Then I should have 1 urls associated with my application
          And I should be able to access the application through the new url.
          And I should be not be able to access the application through the original url.
 
-       @creates_simple_app
+       @creates_simple_app @smoke
        Scenario: redeploy application
          When I upload a modified simple application to AppCloud
          And I update my application on AppCloud

diff --git a/features/canonical_apps.feature b/features/canonical_apps.feature
@@ -93,6 +93,7 @@ Feature: Deploy all canonical apps and check their services
       When I delete my application
       Then it should not be on AppCloud
 
+    @smoke
     Scenario: rails test services
       Given I have deployed my application named app_rails_service
       When I query status of my application

diff --git a/features/service_broker.feature b/features/service_broker.feature
@@ -5,7 +5,7 @@ Feature: Create a simple key-value brokered service and test it using applicatio
 
   Background: create brokered service
 
-  @creates_simple_kv_app  @creates_brokered_service @creates_brokered_service_app
+  @creates_simple_kv_app  @creates_brokered_service @creates_brokered_service_app @smoke
   Scenario: Create a brokered service
     When I have the service broker url and token
     Given I have registered and logged in

diff --git a/features/spring_env.feature b/features/spring_env.feature
@@ -5,7 +5,7 @@ Feature: Use Spring 3.1 Environment on AppCloud
   Background: Validate account
     Given I have registered and logged in
 
-  @creates_spring_env_app
+  @creates_spring_env_app @smoke
   Scenario: deploy Spring 3.1 Environment Application
     Given I have deployed a Spring 3.1 application
     Then the cloud profile should be active

diff --git a/features/tomcat_validation.feature b/features/tomcat_validation.feature
@@ -5,7 +5,7 @@ Feature: Use Tomcat on Cloud Foundry
   Background: Authentication
     Given I have registered and logged in
 
-    @creates_tomcat_version_check_app
+    @creates_tomcat_version_check_app @smoke
     Scenario: Deploy a Java servlet
       Given I have deployed a Java servlet to get the web container version
       When I get the version of the web container from the Java servlet

diff --git a/features/user_management.feature b/features/user_management.feature
@@ -1,3 +1,4 @@
+@smoke
 Feature: User registration with and establishment of an authentication token with AppCloud
 
 	 In order to track service and resource usage

diff --git a/rakelib/bvt.rake b/rakelib/bvt.rake
@@ -3,6 +3,10 @@ namespace :bvt do
     sh "bundle exec cucumber --tags ~@bvt_upgrade"
   end
 
+  task :run_smoke do
+    sh "bundle exec cucumber --tags @smoke"
+  end
+
   desc "Run the Basic Viability Tests with jUnit output"
   task :run_for_ci do
     # Don't fail the Rake run if a test fails.