Tag functional tests with the JEOS required

Change-Id: Ie0204d5382d402058b5538884d42512e724e94db
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py
index cf4ba9874ba0cdae291b33685fc83489272839d6..42ce50be652bca226988bf9fae891294a12d9623 100644 (file)
--- a/heat/tests/functional/test_CFN_API_Actions.py
+++ b/heat/tests/functional/test_CFN_API_Actions.py
@@ -23,7 +23,7 @@ import json
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'api', 'cfn'])
+@attr(tag=['func', 'wordpress', 'api', 'cfn', 'F17'])
 class CfnApiFunctionalTest(unittest.TestCase):
     '''
     This test launches a wordpress stack then attempts to verify

diff --git a/heat/tests/functional/test_HAProxy_Single_Instance.py b/heat/tests/functional/test_HAProxy_Single_Instance.py
index 6a0cfcc26a5a9cd7ce457dd2a79dbf51f8faeeff..b8d0a8f0a59313c470c433e7d8cc8c5de169dde1 100644 (file)
--- a/heat/tests/functional/test_HAProxy_Single_Instance.py
+++ b/heat/tests/functional/test_HAProxy_Single_Instance.py
@@ -21,7 +21,8 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'haproxy', 'HAProxy_Single_Instance.template'])
+@attr(tag=['func', 'wordpress', 'haproxy', 'F17',
+           'HAProxy_Single_Instance.template'])
 class HAProxyFunctionalTest(unittest.TestCase):
     def setUp(self):
         # The HAProxy template somewhat un-usefully load-balances a single

diff --git a/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py b/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py
index bf06fb8aac9c7fded77047cb2c9a37c03ca55627..f48fb149d1ab43d88bc643e597b4c775c5597e36 100644 (file)
--- a/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py
+++ b/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py
@@ -21,7 +21,8 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'openshift', 'OpenShift_Prebuilt_JEOS.template'])
+@attr(tag=['func', 'openshift', 'F16-openshift',
+           'OpenShift_Prebuilt_JEOS.template'])
 class OpenShiftFunctionalTest(unittest.TestCase):
 
     def tearDown(self):

diff --git a/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py b/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py
index 8996dc18c3cf29a3ee06cc3bd0105a8126d63d75..ca877289ead1eb3edd66f880897338c47e012e49 100644 (file)
--- a/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py
+++ b/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py
@@ -24,7 +24,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', '2instance', 'ebs',
+@attr(tag=['func', 'wordpress', '2instance', 'ebs', 'F17',
       'WordPress_2_Instances_With_EBS.template'])
 class WordPress2InstancesWithEBS(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py b/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py
index 0da6adccd3c883959d901eead8ab2cbe5d1071c4..7b9e179d8e601fb8eaa0bb8602c16fc8b97b8c37 100644 (file)
--- a/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py
+++ b/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py
@@ -21,7 +21,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'eip', 'ebs'])
+@attr(tag=['func', 'wordpress', 'eip', 'ebs', 'F17'])
 class WordPress2EBSEIPFunctionalTest(unittest.TestCase):
     def setUp(self):
         template = 'WordPress_2_Instances_With_EBS_EIP.template'

diff --git a/heat/tests/functional/test_WordPress_2_Intances.py b/heat/tests/functional/test_WordPress_2_Intances.py
index d277c2e6572dbcbc2168a155f9fa6c938a021080..8cb716fbbabd496a801a0d2b9e82da83076f310d 100644 (file)
--- a/heat/tests/functional/test_WordPress_2_Intances.py
+++ b/heat/tests/functional/test_WordPress_2_Intances.py
@@ -24,7 +24,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', '2instance', 'ebs',
+@attr(tag=['func', 'wordpress', '2instance', 'ebs', 'F17',
       'WordPress_2_Instances.template'])
 class WordPress2Instances(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_Composed_Instances.py b/heat/tests/functional/test_WordPress_Composed_Instances.py
index 041eb0899ed7fc8adca75b4be0b4c262d5e0c1ab..1ba2e1118cb6fb13713232caf691692b0ce23855 100644 (file)
--- a/heat/tests/functional/test_WordPress_Composed_Instances.py
+++ b/heat/tests/functional/test_WordPress_Composed_Instances.py
@@ -21,7 +21,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'composed',
+@attr(tag=['func', 'wordpress', 'composed', 'F17',
       'WordPress_Composed_Instances.template'])
 class WordPressComposedInstancesFunctionalTest(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_Single_Instance.py b/heat/tests/functional/test_WordPress_Single_Instance.py
index d938427283fc2c96c1b6dc5a7a3c1e4385f3263f..c82702d76426909feb9f0fcff47902891c4ec37f 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance.py
@@ -21,7 +21,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'WordPress_Single_Instance.template'])
+@attr(tag=['func', 'wordpress', 'F17', 'WordPress_Single_Instance.template'])
 class WordPressFunctionalTest(unittest.TestCase):
     def setUp(self):
         template = 'WordPress_Single_Instance.template'

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_Boto.py b/heat/tests/functional/test_WordPress_Single_Instance_Boto.py
index 1327e4dc82892a1757f6527fe9b17a69dd7149b7..32124979344d24ab9f726ffedae86f3c7e1f300d 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_Boto.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_Boto.py
@@ -21,7 +21,8 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'WordPress_Single_Instance.template', 'boto'])
+@attr(tag=['func', 'wordpress', 'F17',
+           'WordPress_Single_Instance.template', 'boto'])
 class WordPressBotoFunctionalTest(unittest.TestCase):
     def setUp(self):
         template = 'WordPress_Single_Instance.template'

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py
index 79d67921dcd9a91d50919c865f5903968c59d57d..52318ddf3b81e91fd0fb36822dad1339cf8cf51f 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py
@@ -24,7 +24,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'ebs',
+@attr(tag=['func', 'wordpress', 'ebs', 'F17',
       'WordPress_Single_Instance_With_EBS.template'])
 class WordPressSingleEBSFunctionalTest(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py
index 1f6bb50389a04f87c889db6c0155ec574f500ce6..c61db81d46e655be9fc89c43ede7a53380091863 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py
@@ -24,7 +24,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'WordPress_Single_Instance_With_EBS_EIP.template',
+@attr(tag=['func', 'WordPress_Single_Instance_With_EBS_EIP.template', 'F17',
       'wordpress', 'ebs', 'eip'])
 class WordPressEBSEIPFunctionalTest(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py
index 00a55d2631f3b402c2070c764085566a47af8808..e6e18dc255ebfe14c37bdaaceb202f0858bfe3f5 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py
@@ -24,7 +24,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'eip',
+@attr(tag=['func', 'wordpress', 'eip', 'F17',
       'WordPress_Single_Instance_With_EIP.template'])
 class WordPressEIPFunctionalTest(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py b/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py
index 408c52d8315c1ecb6ea6071af90af98928955af8..e2412b86f7ca18accdba80055a26d895b52a9beb 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py
@@ -20,7 +20,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'HA',
+@attr(tag=['func', 'wordpress', 'HA', 'F17',
       'WordPress_Single_Instance_With_HA.template'])
 class HaFunctionalTest(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py b/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py
index 2f561316d49f1ece5a9f0d51b6c30d3ba53943ad..e4525d5cf340e753686e6964ba6ed7727ee3f2b8 100644 (file)
--- a/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py
+++ b/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py
@@ -22,7 +22,7 @@ import time
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'HA',
+@attr(tag=['func', 'wordpress', 'HA', 'F17',
       'WordPress_Single_Instance_With_IHA.template'])
 class WordPressIHAFunctionalTest(unittest.TestCase):
     def setUp(self):

diff --git a/heat/tests/functional/test_WordPress_With_LB.py b/heat/tests/functional/test_WordPress_With_LB.py
index 44a042f84237722b9f5c26717ee437547d1e8e73..005562d5ee5813d88b6de3ffbc782b2caddd716f 100644 (file)
--- a/heat/tests/functional/test_WordPress_With_LB.py
+++ b/heat/tests/functional/test_WordPress_With_LB.py
@@ -21,7 +21,7 @@ import os
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'LB', 'WordPress_With_LB.template'])
+@attr(tag=['func', 'wordpress', 'LB', 'F17', 'WordPress_With_LB.template'])
 class WordPressWithLBFunctionalTest(unittest.TestCase):
     def setUp(self):
         template = 'WordPress_With_LB.template'

diff --git a/heat/tests/functional/test_WordPress_With_RDS.py b/heat/tests/functional/test_WordPress_With_RDS.py
index 9845cbc542cbc037073314bde8f2045f0ad46f64..4ef14913b2443369ca746d3b5d8d4d6084a020ed 100644 (file)
--- a/heat/tests/functional/test_WordPress_With_RDS.py
+++ b/heat/tests/functional/test_WordPress_With_RDS.py
@@ -21,7 +21,7 @@ import unittest
 
 
 @attr(speed='slow')
-@attr(tag=['func', 'wordpress', 'RDS',
+@attr(tag=['func', 'wordpress', 'RDS', 'F17',
       'WordPress_With_RDS.template'])
 class WordPressRDSFunctionalTest(unittest.TestCase):
     def setUp(self):