From a93b85ba07113a77a6c0db498a59cef3bca15b94 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Fri, 12 Apr 2019 15:40:02 +0100
Subject: [PATCH] Use OpenStack Train release

Switch all dependencies to use the OpenStack Train release.

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

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

diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack
index 86bf653e7..e22c94f1a 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 "train".
+openstack_release: "train"
 
-# Name of the current OpenStack branch. Default is "master".
+# Name of the current OpenStack branch. Default is "stable/train".
 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..b2ad4e976 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 "train".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "master".
+# Name of the current OpenStack branch. Default is "stable/train".
 #openstack_branch:
 
 ###############################################################################
diff --git a/tox.ini b/tox.ini
index 560ca4ff1..77bf17702 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,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/train}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
@@ -27,7 +27,7 @@ commands = stestr run {posargs}
 basepython = python3
 # 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/train}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
     -r{toxinidir}/test-requirements.txt
@@ -43,7 +43,7 @@ commands =
 [testenv:venv]
 basepython = python3
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
@@ -66,7 +66,7 @@ commands =
 # Molecule only supports python 2.7 and 3.6.
 basepython = python2
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 whitelist_externals =
@@ -119,7 +119,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
@@ -142,7 +142,7 @@ commands = oslo_debug_helper {posargs}
 [testenv:releasenotes]
 basepython = python3
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index a60ae5834..12f1a9b37 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -54,8 +54,14 @@
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
+        # TODO(wszumski): Remove when kayobe stable/train exists.
+        override-checkout: stable/train
       - name: openstack/kolla-ansible
+        # TODO(wszumski): Remove when kayobe stable/train exists.
+        override-checkout: stable/train
       - name: openstack/requirements
+        # TODO(wszumski): Remove when kayobe stable/train exists.
+        override-checkout: stable/train
       - name: openstack/tenks
     irrelevant-files:
       - ^.*\.rst$