From 9c36feb4ed3e43543fd130cedc5989d4b3a72572 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Fri, 12 Jun 2020 13:40:37 +0100
Subject: [PATCH] Revert "Use OpenStack Ussuri release"

This reverts commit ffce6fa6411667f1474c33d845ccc4ac72765689.

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

diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack
index 431d93b40..86bf653e7 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 "ussuri".
-openstack_release: "ussuri"
+# Name of the current OpenStack release. Default is "master".
+openstack_release: "master"
 
-# Name of the current OpenStack branch. Default is "stable/ussuri".
+# 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 7a29298b6..1acfd0756 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 "ussuri".
+# Name of the current OpenStack release. Default is "master".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/ussuri".
+# Name of the current OpenStack branch. Default is "master".
 #openstack_branch:
 
 ###############################################################################
diff --git a/tox.ini b/tox.ini
index d0822f662..76c1f771c 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/ussuri}
+    -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/ussuri}
+    -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/ussuri}
+    -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/ussuri}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 whitelist_externals =
@@ -109,7 +109,7 @@ commands =
 
 [testenv:docs]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
@@ -129,7 +129,7 @@ commands = oslo_debug_helper {posargs}
 
 [testenv:releasenotes]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index a404d5714..bca1f29a5 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -56,14 +56,8 @@
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
-        # TODO(mgoddard): Remove when kayobe stable/ussuri exists.
-        override-checkout: stable/ussuri
       - name: openstack/kolla-ansible
-        # TODO(mgoddard): Remove when kayobe stable/ussuri exists.
-        override-checkout: stable/ussuri
       - name: openstack/requirements
-        # TODO(mgoddard): Remove when kayobe stable/ussuri exists.
-        override-checkout: stable/ussuri
       - name: openstack/tenks
     irrelevant-files:
       - ^.*\.rst$