From 48eed425ef2d300ec56281ddb322c5f05083a19e Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Thu, 4 Jan 2024 19:20:07 +0100
Subject: [PATCH] Add tempest tests for Blazar

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_tempest/+/904785
Needed-By: https://review.opendev.org/c/openstack/openstack-ansible-os_blazar/+/904791
Change-Id: I05ff19772a4df012cced134c81c9befd3d33d3b5
---
 inventory/group_vars/utility_all/source_git.yml   |  4 ++++
 .../bootstrap-host/tasks/prepare_aio_config.yml   |  3 +++
 .../templates/user_variables_blazar.yml.j2        | 15 +++++++++++++++
 zuul.d/jobs.yaml                                  |  2 ++
 4 files changed, 24 insertions(+)
 create mode 100644 tests/roles/bootstrap-host/templates/user_variables_blazar.yml.j2

diff --git a/inventory/group_vars/utility_all/source_git.yml b/inventory/group_vars/utility_all/source_git.yml
index f9590931c1..f7bf97be81 100644
--- a/inventory/group_vars/utility_all/source_git.yml
+++ b/inventory/group_vars/utility_all/source_git.yml
@@ -23,6 +23,10 @@ tempest_plugin_barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/ba
 tempest_plugin_barbican_git_install_branch: 6345b34ae2f47346dd72dc196ec89a3793f57eac
 tempest_plugin_barbican_git_track_branch: master
 
+tempest_plugin_blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-tempest-plugin"
+tempest_plugin_blazar_git_install_branch: 9dd53ae3f9b620c9fcd577b5d10d961500204335
+tempest_plugin_blazar_git_track_branch: master
+
 tempest_plugin_cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder-tempest-plugin"
 tempest_plugin_cinder_git_install_branch: befec23ec1611cee073841b09087a205bd39bd0c
 tempest_plugin_cinder_git_track_branch: master
diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index cd64cbcf39..874edd6bb5 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -148,6 +148,9 @@
     - src: user_variables_barbican.yml.j2
       dest: user_variables_barbican.yml
       condition: "{{ 'barbican' in bootstrap_host_scenarios_expanded }}"
+    - src: user_variables_blazar.yml.j2
+      dest: user_variables_blazar.yml
+      condition: "{{ 'blazar' in bootstrap_host_scenarios_expanded }}"
     - src: user_variables_magnum.yml.j2
       dest: user_variables_magnum.yml
       condition: "{{ 'magnum' in bootstrap_host_scenarios_expanded }}"
diff --git a/tests/roles/bootstrap-host/templates/user_variables_blazar.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_blazar.yml.j2
new file mode 100644
index 0000000000..43acf6d11a
--- /dev/null
+++ b/tests/roles/bootstrap-host/templates/user_variables_blazar.yml.j2
@@ -0,0 +1,15 @@
+---
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+tempest_test_includelist_blazar:
+  - blazar_tempest_plugin.tests.scenario.test_instance_reservation.TestInstanceReservationScenario.test_lease_expiration
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 015688c338..f7201da7f0 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -112,6 +112,7 @@
       # Tempest plus plugins needed for ubuntu distro jobs
       - name: openstack/tempest
       - name: openstack/barbican-tempest-plugin
+      - name: openstack/blazar-tempest-plugin
       - name: openstack/cinder-tempest-plugin
       - name: openstack/cloudkitty-tempest-plugin
       - name: openstack/designate-tempest-plugin
@@ -282,6 +283,7 @@
       # Tempest plus plugins
       - name: openstack/tempest
       - name: openstack/barbican-tempest-plugin
+      - name: openstack/blazar-tempest-plugin
       - name: openstack/cinder-tempest-plugin
       - name: openstack/cloudkitty-tempest-plugin
       - name: openstack/designate-tempest-plugin