Support newton in tempest

* newton release support is started from 13.0.0
* set swift operator role to existing one
* unblacklist server_basic_ops test

JIRA: FUNCTEST-712
Change-Id: Ieb3d9477db3dfa98f940c3732b64f6eb7515f6e6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

5 files changed, 7 insertions, 21 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index dce657e8e..b59d2c834 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 
 # Environment variables
 ARG BRANCH=master
-ARG TEMPEST_TAG=12.2.0
+ARG TEMPEST_TAG=14.0.0
 ARG ODL_TAG=release/beryllium-sr4
 ARG OPENSTACK_TAG=stable/mitaka
 ARG KINGBIRD_TAG=0.2.2
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index f1efd904c..2820f8b0d 100755
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -97,6 +97,8 @@ tempest:
         user_password: tempest
     validation:
         ssh_timeout: 130
+    object_storage:
+        operator_role: SwiftOperator
     private_net_name: tempest-net
     private_subnet_name: tempest-subnet
     private_subnet_cidr: 192.168.150.0/24
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 67b527968..88085d9a3 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -82,6 +82,8 @@ def configure_tempest(logger, deployment_dir, IMAGE_ID=None, FLAVOR_ID=None):
     config.set('identity', 'password', CONST.tempest_identity_user_password)
     config.set(
         'validation', 'ssh_timeout', CONST.tempest_validation_ssh_timeout)
+    config.set('object-storage', 'operator_role',
+               CONST.tempest_object_storage_operator_role)
 
     if CONST.OS_ENDPOINT_TYPE is not None:
         services_list = ['compute',
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
index 5c8581f66..0a4256ce6 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
@@ -74,23 +74,3 @@
         - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
         - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern
         - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern
-
--
-    # https://bugs.launchpad.net/tempest/+bug/1586931
-    scenarios:
-        - os-odl_l2-nofeature-ha
-        - os-odl_l2-nofeature-noha
-        - os-odl_l2-sfc-ha
-        - os-odl_l2-sfc-noha
-        - os-odl_l3-nofeature-ha
-        - os-odl_l3-nofeature-noha
-        - os-nosdn-kvm-ha
-        - os-nosdn-kvm-noha
-        - os-nosdn-nofeature-ha
-        - os-nosdn-nofeature-noha
-        - os-nosdn-ovs-ha
-        - os-nosdn-ovs-noha
-    installers:
-        - fuel
-    tests:
-        - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py
index 7fb03e8a2..3cc744c66 100644
--- a/functest/utils/functest_constants.py
+++ b/functest/utils/functest_constants.py
@@ -146,6 +146,8 @@ TEMPEST_USER_PASSWORD = get_value('tempest.identity.user_password',
                                   'TEMPEST_USER_PASSWORD')
 TEMPEST_SSH_TIMEOUT = get_value('tempest.validation.ssh_timeout',
                                 'TEMPEST_SSH_TIMEOUT')
+TEMPEST_OPERATOR_ROLE = get_value('tempest.object_storage.operator_role',
+                                  'TEMPEST_OPERATOR_ROLE')
 TEMPEST_USE_CUSTOM_IMAGES = get_value('tempest.use_custom_images',
                                       'TEMPEST_USE_CUSTOM_IMAGES')
 TEMPEST_USE_CUSTOM_FLAVORS = get_value('tempest.use_custom_flavors',