From bf0cd75c4126fc7633a77c57c5d66954c939ee4c Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 10 Aug 2012 10:40:24 -0700
Subject: [PATCH] Standardize ci-puppet merge job.
Change-Id: I68993cc8544fa047aa8cd4c8e0d94b3592cbbb24
Reviewed-on: https://review.openstack.org/11165
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
.../config/openstack-ci-puppet.yml | 32 ++-----------------
.../files/jenkins_job_builder/config/zuul.yml | 3 +-
2 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml
index b2046e9a4f..93afef7e0a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml
@@ -3,36 +3,8 @@
github-org: openstack
node: precise
- # TODO: standardize
- #jobs:
- # - gate-{name}-merge
-
-- job:
- name: gate-ci-puppet-merge
- concurrent: true
- node: precise
-
- properties:
- - github:
- url: https://github.com/openstack/openstack-ci-puppet
- - throttle:
- max-per-node: 0
- max-total: 0
- option: project
- enabled: false
-
- wrappers:
- - timeout:
- timeout: 30
- fail: true
- - timestamps
-
- triggers:
- - zuul
-
- builders:
- - gerrit-git-prep
-
+ jobs:
+ - gate-{name}-merge
- job:
name: gate-ci-puppet-syntax
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml
index 5ea95b6270..1606704d5d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml
@@ -5,10 +5,9 @@
jobs:
- python-jobs
- gate-{name}-pyflakes
- # TODO: standardize this
- #- '{name}-docs
+# This is a non-standard docs job because it uses SCP instead of FTP
- job:
name: zuul-docs
project-type: freestyle