From c1c0f9d018649ba6374d2ed4a3304e8ff04d5a00 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 19 Nov 2020 13:58:14 +0000
Subject: [PATCH] Revert "Use OpenStack Victoria release"

This reverts commit 074024d63f9cb364ca16a7a7f0ac94d77ee9466b.

Depends-On: https://review.opendev.org/763959

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

diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack
index c91d10a4..86bf653e 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 "victoria".
-openstack_release: "victoria"
+# Name of the current OpenStack release. Default is "master".
+openstack_release: "master"
 
-# Name of the current OpenStack branch. Default is "stable/victoria".
+# Name of the current OpenStack branch. Default is "master".
 openstack_branch: >-
   {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
 
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index fcae97ff..1acfd075 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 "victoria".
+# Name of the current OpenStack release. Default is "master".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/victoria".
+# Name of the current OpenStack branch. Default is "master".
 #openstack_branch:
 
 ###############################################################################
diff --git a/tox.ini b/tox.ini
index d845d39d..5914157c 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/victoria}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -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/victoria}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -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/victoria}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -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/victoria}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -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/victoria}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf doc/build/html
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 1bcea35f..c7b9bfe5 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -35,9 +35,7 @@
     pre-run: playbooks/kayobe-tox-molecule/pre.yml
     timeout: 3600
     required-projects:
-      - name: openstack/requirements
-        # TODO: remove after branching
-        override-checkout: stable/victoria
+      - openstack/requirements
     vars:
       tox_envlist: molecule
     irrelevant-files:
@@ -58,14 +56,8 @@
       - 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$
-- 
GitLab