Revert "Use OpenStack Victoria release"

This reverts commit 074024d63f.

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

Change-Id: Ia5715c6914ac454081a95b6e1788e80f53c72e30

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 }}
 

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:
 
 ###############################################################################

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

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$