From f94a6531958d95b5d35801dd0f7cf1cef3c115bb Mon Sep 17 00:00:00 2001
From: Darragh Bailey <daragh.bailey@gmail.com>
Date: Sun, 27 Jul 2014 01:38:23 +0100
Subject: [PATCH] Remove duplicate unused job definitions

Remove duplicate references to 'gate-{name}-docs' where the project uses
the job-group 'python-jobs' as this already includes the docs job.

Remove template-job definition for 'gate-{name}-build' as it has been
replaced by a job-group which supersedes the template-job definition due
to the parse order of jobs, job groups and job templates.

Change-Id: I096087e2e6663f919fb3779a7b628abde2ebe0ab
---
 .../config/maven-plugin-jobs.yaml             | 21 -------------------
 .../jenkins_job_builder/config/projects.yaml  |  2 --
 2 files changed, 23 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
index 29e3bd2726..ba1094cf1a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
@@ -1,27 +1,6 @@
 # usig a freestyle project to work around jenkins bug:
 # https://issues.jenkins-ci.org/browse/JENKINS-14193
 
-- job-template:
-    name: 'gate-{name}-build'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 30
-      - timestamps
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - shell: |
-          #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/version-properties.sh
-          source version.properties
-          mvn clean package -Dproject-version=$PROJECT_VER
-
-    publishers:
-      - console-log
-
 - job-template:
     name: '{name}-localrepo-upload'
     node: '{node}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 4ec86beebd..f366d22def 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -172,7 +172,6 @@
 
     jobs:
       - python-jobs
-      - gate-{name}-docs
 
 - project:
     name: python-congressclient
@@ -216,7 +215,6 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - gate-{name}-docs
 
 - project:
     name: magnetodb