Merge "Skip tests when heat is unavailable"
diff --git a/.zuul.yaml b/.zuul.yaml
index 74ebce3..45ccd43 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,47 +1,12 @@
- job:
- name: heat-functional-convg-stein
- parent: heat-functional-convg-mysql-lbaasv2-py3
- nodeset: openstack-single-node-bionic
- override-checkout: stable/stein
- vars:
- branch_override: stable/stein
-
-- job:
- name: heat-functional-orig-stein
- parent: heat-functional-orig-mysql-lbaasv2
- nodeset: openstack-single-node-bionic
- override-checkout: stable/stein
- vars:
- branch_override: stable/stein
- use_python3: 1
-
-- job:
- name: heat-functional-convg-train
- parent: heat-functional-convg-mysql-lbaasv2-py3
- nodeset: openstack-single-node-bionic
- override-checkout: stable/train
- vars:
- branch_override: stable/train
-
-- job:
- name: heat-functional-orig-train
- parent: heat-functional-orig-mysql-lbaasv2
- nodeset: openstack-single-node-bionic
- override-checkout: stable/train
- vars:
- branch_override: stable/train
- use_python3: 1
-
-- job:
- name: heat-functional-ussuri
+ name: heat-functional-yoga
parent: heat-functional
- nodeset: openstack-single-node-bionic
- override-checkout: stable/ussuri
+ override-checkout: stable/yoga
- job:
- name: heat-functional-victoria
+ name: heat-functional-xena
parent: heat-functional
- override-checkout: stable/victoria
+ override-checkout: stable/xena
- job:
name: heat-functional-wallaby
@@ -49,6 +14,7 @@
override-checkout: stable/wallaby
- project:
+ queue: heat
templates:
- check-requirements
- tempest-plugin-jobs
@@ -56,13 +22,10 @@
jobs:
- heat-functional
- heat-functional-legacy
- - heat-functional-convg-train
- - heat-functional-orig-train
- - heat-functional-ussuri
- - heat-functional-victoria
+ - heat-functional-yoga
+ - heat-functional-xena
- heat-functional-wallaby
gate:
- queue: heat
jobs:
- heat-functional
- heat-functional-legacy
diff --git a/heat_tempest_plugin/tests/api/test_heat_api.py b/heat_tempest_plugin/tests/api/test_heat_api.py
index d256437..9720fe3 100644
--- a/heat_tempest_plugin/tests/api/test_heat_api.py
+++ b/heat_tempest_plugin/tests/api/test_heat_api.py
@@ -63,8 +63,8 @@
keystoneauth1.exceptions.discovery.DiscoveryFailure,
keystoneauth1.exceptions.connection.UnknownConnectionError,
keystoneauth1.exceptions.connection.ConnectFailure):
- LOG.warn("Keystone auth exception: %s: %s" % (sys.exc_info()[0],
- sys.exc_info()[1]))
+ LOG.warning("Keystone auth exception: %s: %s" %
+ (sys.exc_info()[0], sys.exc_info()[1]))
# Clear the auth_url, as there is no point in tempest trying
# to authenticate later with mis-configured or unreachable endpoint
conf.auth_url = None
diff --git a/setup.cfg b/setup.cfg
index 8776610..a25d96c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,11 +1,11 @@
[metadata]
name = heat-tempest-plugin
summary = OpenStack Orchestration Tempest Plugin
-description-file =
+description_file =
README.rst
author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = http://docs.openstack.org/developer/heat-tempest-plugin
+author_email = openstack-discuss@lists.openstack.org
+home_page = http://docs.openstack.org/developer/heat-tempest-plugin
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology