From db71312063cce03a8d81034a18fab304fa56ff15 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 3 May 2016 20:24:15 +0200
Subject: [PATCH] Define job-groups for api-ref and api-guide

Since more projects are going to use these, let's define job-groups
for api-ref and api-guide jobs. Use these job-groups in the
projects.yaml file where possible.

Change-Id: Ibc5b094ae3ea58433c5e8a40c82ceeb89a26bb2c
---
 jenkins/jobs/api-jobs.yaml | 28 ++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  9 +++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/jenkins/jobs/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml
index 2755595ada..b2ae03da74 100644
--- a/jenkins/jobs/api-jobs.yaml
+++ b/jenkins/jobs/api-jobs.yaml
@@ -96,6 +96,20 @@
           remove-prefix: 'api-guide/build/html/'
       - console-log
 
+# Be aware that the variable "service" needs to be set when this job
+# group is used.
+# The "service" variable comes from the service catalog, which is
+# based on the openstack/service-types-authority project as a
+# canonical reference for names. When your project has spaces in the
+# service entry, use dashes for the spaces, such as "object-storage"
+# (the service is not swift).
+- job-group:
+    name: api-guide-jobs
+
+    jobs:
+      - gate-{name}-api-guide
+      - '{name}-api-guide'
+
 - job-template:
     name: gate-{name}-api-ref
     description: Build and draft the API Reference from source.
@@ -132,6 +146,20 @@
           remove-prefix: 'api-ref/build/html/'
       - console-log
 
+# Be aware that the variable "service" needs to be
+# set when this job group is used.
+# The "service" variable comes from the service catalog, which is
+# based on the openstack/service-types-authority project as a
+# canonical reference for names. When your project has spaces in the
+# service entry, use dashes for the spaces, such as "object-storage"
+# (the service is not swift).
+- job-group:
+    name: api-ref-jobs
+
+    jobs:
+      - gate-{name}-api-ref
+      - '{name}-api-ref'
+
 - job:
     name: python-openstacksdk-docs
     description: Build and publish the Python SDK docs from source.
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a1cba4522a..dec4a3cc03 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -284,8 +284,7 @@
       - translation-jobs
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
-      - gate-{name}-api-guide
-      - '{name}-api-guide':
+      - api-guide-jobs:
           service: key-manager
 
 - project:
@@ -4100,11 +4099,9 @@
       - translation-jobs-mitaka
       - openstack-releasenotes-jobs
       - periodic-python-jobs-with-oslo-master
-      - gate-{name}-api-guide
-      - '{name}-api-guide':
+      - api-guide-jobs:
           service: compute
-      - gate-{name}-api-ref
-      - '{name}-api-ref':
+      - api-ref-jobs:
           service: compute
 
 - project: