From 074024d63f9cb364ca16a7a7f0ac94d77ee9466b Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 5 Nov 2020 10:44:38 +0100
Subject: [PATCH] Use OpenStack Victoria release

Switch all dependencies to use the OpenStack Victoria release.

This commit should be reverted on the master branch once the
Kayobe stable/victoria branch has been cut and RC1 released.

Change-Id: I7f1113577fd48aa0715b644cc66bfca197771ca6
---
 ansible/group_vars/all/openstack |  6 +++---
 etc/kayobe/openstack.yml         |  4 ++--
 tox.ini                          | 10 +++++-----
 zuul.d/jobs.yaml                 | 10 +++++++++-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack
index 86bf653e7..c91d10a46 100644
--- a/ansible/group_vars/all/openstack
+++ b/ansible/group_vars/all/openstack
@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "master".
-openstack_release: "master"
+# Name of the current OpenStack release. Default is "victoria".
+openstack_release: "victoria"
 
-# Name of the current OpenStack branch. Default is "master".
+# Name of the current OpenStack branch. Default is "stable/victoria".
 openstack_branch: >-
   {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
 
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index 1acfd0756..fcae97ff2 100644
--- a/etc/kayobe/openstack.yml
+++ b/etc/kayobe/openstack.yml
@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "master".
+# Name of the current OpenStack release. Default is "victoria".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "master".
+# Name of the current OpenStack branch. Default is "stable/victoria".
 #openstack_branch:
 
 ###############################################################################
diff --git a/tox.ini b/tox.ini
index 5914157cc..d845d39dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ setenv =
    OS_STDERR_CAPTURE=1
    OS_TEST_TIMEOUT=60
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
@@ -27,7 +27,7 @@ commands = stestr run {posargs}
 [testenv:pep8]
 # sphinx8 needs the sphinx package which is required via doc/requirements.txt
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
     -r{toxinidir}/test-requirements.txt
@@ -42,7 +42,7 @@ commands =
 
 [testenv:venv]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
@@ -60,7 +60,7 @@ commands =
 
 [testenv:molecule]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 whitelist_externals =
@@ -109,7 +109,7 @@ commands =
 
 [testenv:docs]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
     -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf doc/build/html
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 194ec9d3e..ff7a2dafa 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -35,7 +35,9 @@
     pre-run: playbooks/kayobe-tox-molecule/pre.yml
     timeout: 3600
     required-projects:
-      - openstack/requirements
+      - name: openstack/requirements
+        # TODO: remove after branching
+        override-checkout: stable/victoria
     vars:
       tox_envlist: molecule
     irrelevant-files:
@@ -56,8 +58,14 @@
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
+        # TODO: remove after branching
+        override-checkout: stable/victoria
       - name: openstack/kolla-ansible
+        # TODO: remove after branching
+        override-checkout: stable/victoria
       - name: openstack/requirements
+        # TODO: remove after branching
+        override-checkout: stable/victoria
       - name: openstack/tenks
     irrelevant-files:
       - ^.*\.rst$