From 6b9db7e63830acf804437aedc8969301157ccc32 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Mon, 25 Feb 2019 10:08:00 +1100
Subject: [PATCH] Add requirements history

We have static URLs redirecting /constraints/upper/series to the
appropriate git interface.  In the next change in this series we move to
a data-driven model so let's supply the data :)

Even though we have tag history that goes back to Folsom only import
Juno and later because that's when we first added constraints support

This means as the create and delete branches for requirements, like
other projects, we have a central source of truth (other than git) from
which to update the htaccess redirects.

I had update deliverables.py to account for the fact most of the
requirements branches don't have a release.  This does make the table
look a little funny (as the earliest release is the series eol tag :()
but I'm not sure how we can do better there.

Change-Id: Ie8e60dc865ab301539c0bb085a52dd25f3f62edf
---
 deliverables/juno/requirements.yaml                | 14 ++++++++++++++
 deliverables/kilo/requirements.yaml                | 14 ++++++++++++++
 deliverables/liberty/requirements.yaml             | 14 ++++++++++++++
 deliverables/mitaka/requirements.yaml              | 14 ++++++++++++++
 .../{_independent => newton}/requirements.yaml     |  5 +++++
 doc/source/_exts/deliverables.py                   |  2 +-
 6 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 deliverables/juno/requirements.yaml
 create mode 100644 deliverables/kilo/requirements.yaml
 create mode 100644 deliverables/liberty/requirements.yaml
 create mode 100644 deliverables/mitaka/requirements.yaml
 rename deliverables/{_independent => newton}/requirements.yaml (51%)

diff --git a/deliverables/juno/requirements.yaml b/deliverables/juno/requirements.yaml
new file mode 100644
index 0000000000..e53a6c9914
--- /dev/null
+++ b/deliverables/juno/requirements.yaml
@@ -0,0 +1,14 @@
+---
+launchpad: openstack-requirements
+team: requirements
+type: other
+include-pypi-link: yes
+release-model: cycle-with-intermediary
+stable-branch-type: tagless
+repository-settings:
+  openstack/requirements: {}
+releases:
+  - projects:
+      - hash: f2223f2b9003b4dd7182159c7d6b9457c6cd18a1
+        repo: openstack/requirements
+    version: juno-eol
diff --git a/deliverables/kilo/requirements.yaml b/deliverables/kilo/requirements.yaml
new file mode 100644
index 0000000000..9f0f3db291
--- /dev/null
+++ b/deliverables/kilo/requirements.yaml
@@ -0,0 +1,14 @@
+---
+launchpad: openstack-requirements
+team: requirements
+type: other
+include-pypi-link: yes
+release-model: cycle-with-intermediary
+stable-branch-type: tagless
+repository-settings:
+  openstack/requirements: {}
+releases:
+  - projects:
+      - hash: b7c9502f924acc4f8e13b1e561520f14a90535a3
+        repo: openstack/requirements
+    version: kilo-eol
diff --git a/deliverables/liberty/requirements.yaml b/deliverables/liberty/requirements.yaml
new file mode 100644
index 0000000000..b07f665691
--- /dev/null
+++ b/deliverables/liberty/requirements.yaml
@@ -0,0 +1,14 @@
+---
+launchpad: openstack-requirements
+team: requirements
+type: other
+include-pypi-link: yes
+release-model: cycle-with-intermediary
+stable-branch-type: tagless
+repository-settings:
+  openstack/requirements: {}
+releases:
+  - projects:
+      - hash: 104c1f0cdeb2aebe7e63f04c322c26e3e2519ff2
+        repo: openstack/requirements
+    version: liberty-eol
diff --git a/deliverables/mitaka/requirements.yaml b/deliverables/mitaka/requirements.yaml
new file mode 100644
index 0000000000..111a7b7b33
--- /dev/null
+++ b/deliverables/mitaka/requirements.yaml
@@ -0,0 +1,14 @@
+---
+launchpad: openstack-requirements
+team: requirements
+type: other
+include-pypi-link: yes
+release-model: cycle-with-intermediary
+stable-branch-type: tagless
+repository-settings:
+  openstack/requirements: {}
+releases:
+  - projects:
+      - hash: 2a6816dab055a70747f37a6184b0d0d196a73647
+        repo: openstack/requirements
+    version: mitaka-eol
diff --git a/deliverables/_independent/requirements.yaml b/deliverables/newton/requirements.yaml
similarity index 51%
rename from deliverables/_independent/requirements.yaml
rename to deliverables/newton/requirements.yaml
index 5d7eb4e89a..58c5419bac 100644
--- a/deliverables/_independent/requirements.yaml
+++ b/deliverables/newton/requirements.yaml
@@ -3,6 +3,11 @@ launchpad: openstack-requirements
 team: requirements
 type: other
 include-pypi-link: yes
+release-model: cycle-with-intermediary
 stable-branch-type: tagless
 repository-settings:
   openstack/requirements: {}
+branches:
+  - location:
+      openstack/requirements: c589637b184e77901d37cc7faa93dbb906979448
+    name: stable/newton
diff --git a/doc/source/_exts/deliverables.py b/doc/source/_exts/deliverables.py
index cb3cabb300..b607464044 100644
--- a/doc/source/_exts/deliverables.py
+++ b/doc/source/_exts/deliverables.py
@@ -215,7 +215,7 @@ class DeliverableDirectiveBase(rst.Directive):
         if not self.team_name:
             most_recent = []
             for deliv in deliverables:
-                earliest_version = deliv.earliest_release
+                recent_version = earliest_version = deliv.earliest_release
                 # Determine the most recent release that is not an EOL
                 # tag.
                 for r in reversed(deliv.releases):