From aa8087571ea7c93d6406b2e8fb0e241e0cd621ea Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Thu, 21 Jul 2016 14:04:15 -0400
Subject: [PATCH] split mistral-extra from mistral and fix validation

The mistral-extra repo is being deprecated. Split it out into its own
repository and mark it as not being released so we can ignore some of
the validation checks that now fail because of changes in
project-config.

Change-Id: Iaaf3a70b108618ed46df73ba834c554f6adde458
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 deliverables/newton/mistral-extra.yaml | 14 ++++++++++++++
 deliverables/newton/mistral.yaml       |  4 ----
 openstack_releases/cmds/validate.py    |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 deliverables/newton/mistral-extra.yaml

diff --git a/deliverables/newton/mistral-extra.yaml b/deliverables/newton/mistral-extra.yaml
new file mode 100644
index 0000000000..df36cc4354
--- /dev/null
+++ b/deliverables/newton/mistral-extra.yaml
@@ -0,0 +1,14 @@
+---
+launchpad: mistral
+team: mistral
+send-announcements-to: openstack-announce@lists.openstack.org
+artifact-link-mode: none
+releases:
+  - version: 3.0.0.0b1
+    projects:
+      - repo: openstack/mistral-extra
+        hash: a8c9c799e83786919913addbc66584b4fdf6e2b1
+  - version: 3.0.0.0b2
+    projects:
+      - repo: openstack/mistral-extra
+        hash: a2df1d7cf631b7d1136c1f2bd02a89c97408d16e
diff --git a/deliverables/newton/mistral.yaml b/deliverables/newton/mistral.yaml
index d01b378fd5..148c992fb9 100644
--- a/deliverables/newton/mistral.yaml
+++ b/deliverables/newton/mistral.yaml
@@ -9,13 +9,9 @@ releases:
         hash: 64afe2aa544121e00698dfcc8e080ac2bc92e608
       - repo: openstack/mistral-dashboard
         hash: 5725a06e077affd49eaf72d547aba717c0858479
-      - repo: openstack/mistral-extra
-        hash: a8c9c799e83786919913addbc66584b4fdf6e2b1
   - version: 3.0.0.0b2
     projects:
       - repo: openstack/mistral
         hash: d0009166e09a5788999dec40c017094c6baa17c5
       - repo: openstack/mistral-dashboard
         hash: 5725a06e077affd49eaf72d547aba717c0858479
-      - repo: openstack/mistral-extra
-        hash: a2df1d7cf631b7d1136c1f2bd02a89c97408d16e
diff --git a/openstack_releases/cmds/validate.py b/openstack_releases/cmds/validate.py
index 1f1693cddb..13fadeafa7 100644
--- a/openstack_releases/cmds/validate.py
+++ b/openstack_releases/cmds/validate.py
@@ -326,7 +326,7 @@ def main():
                 deliverable_name=deliverable_name,
             )
         )
-        if not expected_repos:
+        if link_mode != 'none' and not expected_repos:
             msg = ('unable to find deliverable %s in the governance list' %
                    deliverable_name)
             print(msg)