From a3659fe546b61d349bc7c26cd1b06ef49fadc606 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Tue, 26 Feb 2013 13:41:59 +1300
Subject: [PATCH] Add openstack/heat-cfntools to gerrit review
https://github.com/heat-api/heat-cfntools
heat-cfntools contains scripts which need to be installed on
heat provisioned guests. These scripts have recently been broken out
of the heat-jeos repo, so the next task is getting better test coverage.
This change will populate openstack/heat-cfntools using
the existing heat-api/heat-cfntools as upstream
Change-Id: I71ec9b12bf9cdef333d540812a4eeb8a7e593d93
Reviewed-on: https://review.openstack.org/22931
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
.../files/gerritbot_channel_config.yaml | 1 +
.../acls/openstack/heat-cfntools.config | 16 ++++++++++++++
.../jenkins_job_builder/config/heat.yaml | 15 +++++++++++++
.../jenkins_job_builder/config/projects.yaml | 13 +++++++++++
.../openstack_project/files/zuul/layout.yaml | 22 +++++++++++++++++++
.../templates/review.projects.yaml.erb | 3 +++
6 files changed, 70 insertions(+)
create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config
diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 32cb85ae17..e073dd768a 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -127,5 +127,6 @@ heat:
projects:
- openstack/heat
- openstack/python-heatclient
+ - openstack/heat-cfntools
branches:
- master
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config b/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config
new file mode 100644
index 0000000000..20c608225d
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config
@@ -0,0 +1,16 @@
+[access "refs/heads/*"]
+ label-Code-Review = -2..+2 group heat-core
+ label-Approved = +0..+1 group heat-core
+[access "refs/heads/milestone-proposed"]
+ label-Code-Review = -2..+2 group heat-drivers
+ label-Approved = +0..+1 group heat-drivers
+[access "refs/tags/*"]
+ create = group heat-drivers
+ pushTag = group heat-drivers
+[project]
+ state = active
+[receive]
+ requireChangeId = true
+ requireContributorAgreement = true
+[submit]
+ mergeContent = true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
index 04326f11a7..c0db628111 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
@@ -26,3 +26,18 @@
publishers:
- coverage-log
- console-log
+- job:
+ name: 'dev-heat-cfntools-coverage'
+ node: 'precise'
+
+ triggers:
+ - zuul
+
+ builders:
+ - gerrit-git-prep
+ - coverage
+
+ publishers:
+ - coverage-log
+ - console-log
+
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 14cb26913c..e01384065b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -140,6 +140,19 @@
- pypi-jobs
+- project:
+ name: heat-cfntools
+ github-org: openstack
+ node: precise
+ tarball-site: tarballs.openstack.org
+ doc-publisher-site: docs.openstack.org
+
+ jobs:
+ - python-jobs
+ - openstack-publish-jobs
+ - pypi-jobs
+
+
- project:
name: horizon
github-org: openstack
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 77c009b1f6..f16ad0252a 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -92,6 +92,8 @@ jobs:
voting: false
- name: dev-python-heatclient-coverage
voting: false
+ - name: dev-heat-cfntools-coverage
+ voting: false
- name: jenkins-job-builder-compare-xml
voting: false
failure-message: XML output has changed.
@@ -919,6 +921,26 @@ projects:
- python-heatclient-pypi-upload
- python-heatclient-docs
+ - name: openstack/heat-cfntools
+ check:
+ - gate-heat-cfntools-pep8:
+ - gate-heat-cfntools-python26
+ - gate-heat-cfntools-python27
+ - dev-heat-cfntools-coverage
+ gate:
+ - gate-heat-cfntools-pep8
+ - gate-heat-cfntools-python26
+ - gate-heat-cfntools-python27
+ post:
+ - heat-cfntools-branch-tarball
+ - heat-cfntools-coverage
+ pre-release:
+ - heat-cfntools-tarball
+ release:
+ - heat-cfntools-tarball:
+ - heat-cfntools-pypi-upload
+ - heat-cfntools-docs
+
- name: stackforge/reddwarf
check:
- gate-reddwarf-pep8:
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 3fa7a4453c..208c449c36 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -9,6 +9,9 @@
has-pull-requests: False
has-downloads: False
---
+- project: openstack/heat-cfntools
+ acl_config: /home/gerrit2/acls/openstack/heat-cfntools.config
+ upstream: git://github.com/heat-api/heat-cfntools.git
- project: openstack/heat
acl_config: /home/gerrit2/acls/openstack/heat.config
- project: openstack/python-heatclient