From 974cbbfc7f09bc5276566bdf73bf246d1ad09c78 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 13 Oct 2018 18:07:14 +0200
Subject: [PATCH] Update lib-forward-testing

The tempest-full job can replace the legacy job
legacy-tempest-dsvm-neutron-src since tempest installs the checked out
libraries, including the library under test. We have already converted
the py3 variant, and can convert the py2 the same way.

The Zuul v3 native tempest-full job is not available on stable/ocata, so
use the legacy job on ocata and older.

Move the template to project-templates file and add description.

Change-Id: Iac9162c1321f7f825684e1c20cc13ff5821d37d3
---
 zuul.d/project-templates.yaml             | 20 ++++++++++++++++++++
 zuul.d/zuul-legacy-project-templates.yaml |  9 ---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index d6a59c98..53b655bc 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -1397,6 +1397,26 @@
         - infra-puppet-apply-4-ubuntu-xenial
         - openstackci-beaker
 
+- project-template:
+    name: lib-forward-testing
+    description: |
+      Run tempest, installing the library from source to ensure that
+      changes in the library do not break any of the services running
+      in devstack.
+    check:
+      jobs:
+        # Tempest-full is only working on pike and newer.
+        - tempest-full:
+            branches: ^(?!stable/(newton|ocata)).*$
+        - legacy-tempest-dsvm-neutron-src:
+            branches: ^stable/(newton|ocata)$
+    gate:
+      jobs:
+        - tempest-full:
+            branches: ^(?!stable/(newton|ocata)).*$
+        - legacy-tempest-dsvm-neutron-src:
+            branches: ^stable/(newton|ocata)$
+
 - project-template:
     name: lib-forward-testing-python3
     description: |
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 6872f002..d47d0fd4 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -73,15 +73,6 @@
         - neutron-grenade:
             branches: ^(?!stable/(newton|ocata)).*$
 
-- project-template:
-    name: lib-forward-testing
-    check:
-      jobs:
-        - legacy-tempest-dsvm-neutron-src
-    gate:
-      jobs:
-        - legacy-tempest-dsvm-neutron-src
-
 - project-template:
     name: lib-forward-testing-plugin
     check: