From 136dfa02d050454d3b663186a212184a86b63c3e Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Mon, 4 Jul 2022 21:29:47 +0200
Subject: [PATCH] Control rally-openstack installed version

At the moment we don't have control what version of rally-openstack
is being installed. So we are installing latest version available in
PyPi. However rally package version is defined in
rally-openstack constraints.

With this patch we add variables to be able to adjust source of
rally-openstack as well as pick version for installation.

We also temporary disable upgrade jobs to resolve circular dependency

Needed-By: https://review.opendev.org/c/openstack/openstack-ansible/+/847272
Change-Id: I8100dfd3544c0530815fb877b44b960d404f635b
---
 defaults/main.yml                                         | 6 ++++--
 .../notes/rally-openstack-git-121821ef54c48419.yaml       | 8 ++++++++
 zuul.d/project.yaml                                       | 8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/rally-openstack-git-121821ef54c48419.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index dc9712b..71c0d15 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -43,14 +43,16 @@ rally_galera_database: rally
 rally_galera_user: rally
 rally_database_connection_string: mysql+pymysql://{{ rally_galera_user }}:{{ rally_galera_password }}@{{ rally_galera_address }}/{{ rally_galera_database }}?charset=utf8
 
+rally_openstack_git_repo: https://opendev.org/openstack/rally-openstack
+rally_openstack_git_install_branch: master
 # NOTE(mnaser): This uses the Rally upper-constraints because it
 #               is branchless and maintains it's own constraints,
 #               outside of requirements.
-rally_upper_constraints_url: "https://opendev.org/openstack/rally-openstack/raw/branch/master/upper-constraints.txt"
+rally_upper_constraints_url: "{{ rally_openstack_git_repo }}/raw/branch/master/upper-constraints.txt"
 rally_git_constraints:
   - "--constraint {{ rally_upper_constraints_url }}"
 rally_pip_packages:
-  - rally-openstack
+  - "git+{{ rally_openstack_git_repo }}@{{ rally_openstack_git_install_branch }}#egg=rally-openstack"
   - PyMySQL
 
 rally_config_overrides: {}
diff --git a/releasenotes/notes/rally-openstack-git-121821ef54c48419.yaml b/releasenotes/notes/rally-openstack-git-121821ef54c48419.yaml
new file mode 100644
index 0000000..e7951d1
--- /dev/null
+++ b/releasenotes/notes/rally-openstack-git-121821ef54c48419.yaml
@@ -0,0 +1,8 @@
+---
+
+features:
+  - |
+    Implemented variables ``rally_openstack_git_repo`` and
+    ``rally_openstack_git_install_branch`` that allow to override installation
+    source for rally-openstack package as well as control installed version
+    of the package.
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 780590c..b1b3ed7 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -23,3 +23,11 @@
       # - openstack-ansible-deploy-aio_distro_metal-jobs
       - publish-openstack-docs-pti
       - build-release-notes-jobs-python3
+    check:
+      jobs:
+        - openstack-ansible-upgrade-aio_metal-ubuntu-focal:
+            voting: false
+    gate:
+      jobs:
+        - openstack-ansible-upgrade-aio_metal-ubuntu-focal:
+            voting: false