From 9211ea4c968e1f7422c476424937fb43778d5910 Mon Sep 17 00:00:00 2001 From: Taseer Ahmed Date: Thu, 12 Apr 2018 13:59:43 +0500 Subject: [PATCH] Improve Congress scenario testing - Activate congress tempest based on inventory. - Glance is also required for the overall scenario to pass - SHA bump to update the latest "hacking" requirements - The Depends-on patch allow the tempest role to skip the installation of test-requirements conditionally. We therefore flip that switch for the congress test-requirements. Depends-On: https://review.openstack.org/#/c/554611 Change-Id: Idf774ead76e9f45e510276afc09c402f111b8fd9 --- inventory/group_vars/utility_all.yml | 1 + .../bootstrap-host/templates/user_variables_congress.yml.j2 | 2 +- tests/vars/bootstrap-aio-vars.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/utility_all.yml b/inventory/group_vars/utility_all.yml index 20f1acd64e..910aba9b87 100644 --- a/inventory/group_vars/utility_all.yml +++ b/inventory/group_vars/utility_all.yml @@ -53,6 +53,7 @@ tempest_service_available_horizon: "{{ groups['horizon_all'] is defined and grou tempest_service_available_neutron: "{{ groups['neutron_all'] is defined and groups['neutron_all'] | length > 0 }}" tempest_service_available_nova: "{{ groups['nova_all'] is defined and groups['nova_all'] | length > 0 }}" tempest_service_available_swift: "{{ (groups['swift_all'] is defined and groups['swift_all'] | length > 0) or (groups['ceph-rgw'] is defined and groups['ceph-rgw'] | length > 0) }}" +tempest_service_available_congress: "{{ groups['congress_all'] is defined and groups['congress_all'] | length > 0 }}" tempest_log_dir: /var/log/utility tempest_venv_tag: "{{ openstack_release }}" diff --git a/tests/roles/bootstrap-host/templates/user_variables_congress.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_congress.yml.j2 index b2e4c67dcc..5766fa1820 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_congress.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_congress.yml.j2 @@ -15,7 +15,7 @@ tempest_plugins: - name: congress-tempest-plugin repo: https://github.com/openstack/congress-tempest-plugin - branch: 15a14c3c8ee844db53571d28f86eafe8bc5fc02b # HEAD of "master" as of 16.02.2018 + branch: e8d68f8da9380aacdf05693aaf8bb9f8e570dd93 # HEAD of "master" as of 19.04.2018 tempest_whitelist: - congress_tempest_plugin.tests.scenario.test_congress_basic_ops \ No newline at end of file diff --git a/tests/vars/bootstrap-aio-vars.yml b/tests/vars/bootstrap-aio-vars.yml index db557da608..b424677f5d 100644 --- a/tests/vars/bootstrap-aio-vars.yml +++ b/tests/vars/bootstrap-aio-vars.yml @@ -57,6 +57,7 @@ confd_overrides: - name: nova.yml.aio - name: neutron.yml.aio - name: keystone.yml.aio + - name: glance.yml.aio - name: congress.yml.aio translations: - name: haproxy.yml.aio