From 9b2efc3a6b7e60868e7cf19f60082b384ce2c212 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Thu, 26 Dec 2013 11:02:05 -0800
Subject: [PATCH] Template {gate,periodic}-gitdm

Continuing to remove periodic variants of gate jobs.

Change-Id: I31c1d025e43a8c4a2045fc9f99ec1759ca9ee971
---
 .../jenkins_job_builder/config/gitdm.yaml     | 29 ++++---------------
 .../jenkins_job_builder/config/projects.yaml  | 13 +++++++++
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml
index fbfe467d2b..b7d32c15ed 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml
@@ -1,34 +1,17 @@
-- job:
-    name: gate-gitdm
-    node: precise
+- job-template:
+    name: '{pipeline}-gitdm'
+
+    node: '{node}'
 
     builders:
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          export TEMPDIR=${TEMPDIR:-$(mktemp -d $(pwd)/dmtmp-XXXXXX)}
-          export GITBASE=${TEMPDIR}/git
+          export TEMPDIR=${{TEMPDIR:-$(mktemp -d $(pwd)/dmtmp-XXXXXX)}}
+          export GITBASE=${{TEMPDIR}}/git
           export LP_STATS=n
           bash ./do-it.sh
       - link-logs
 
     publishers:
       - console-log
-
-
-- job:
-    name: periodic-gitdm
-    node: precise
-
-    builders:
-      - gerrit-git-prep
-      - shell: |
-          #!/bin/bash -xe
-          export TEMPDIR=${TEMPDIR:-$(mktemp -d $(pwd)/dmtmp-XXXXXX)}
-          export GITBASE=${TEMPDIR}/git
-          export LP_STATS=n
-          bash ./do-it.sh
-      - link-logs
-
-    publishers:
-      - console-log-periodic
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 657cdf6a0c..66dce1cc37 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -146,6 +146,19 @@
       - gate-{name}-puppet-syntax
       - gate-{name}-pep8
 
+- project:
+    name: gitdm
+    github-org: openstack-infra
+    node: precise
+
+    jobs:
+      - '{pipeline}-gitdm':
+          pipeline: gate
+          node: precise
+      - '{pipeline}-gitdm':
+          pipeline: periodic
+          node: precise
+
 - project:
     name: savanna
     github-org: openstack