From 097409ca6553a5baa77966cd0542a47178a2ec19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Fri, 5 Jul 2013 15:00:40 -0400 Subject: [PATCH] Fix module name in puppet-lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Double the curly braces because the template engine is just the Python string template system. Pass name as an argument to the macro for the 'project' parameter. Change-Id: I6cd8fce6052c94fc0d3c3f75ee0a62c366e430e6 Reviewed-on: https://review.openstack.org/35863 Reviewed-by: James E. Blair Reviewed-by: Mathieu Gagné Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- .../files/jenkins_job_builder/config/macros.yaml | 4 ++-- .../files/jenkins_job_builder/config/puppet-module-jobs.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index fb9846a42f..295669096f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -66,10 +66,10 @@ name: puppet-lint builders: - shell: | - test -d modules || { + test -d modules || {{ ln -s . {project} cd {project} - } + }} rake lint - builder: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml index e91c993356..b14d177b3a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml @@ -20,7 +20,8 @@ builders: - gerrit-git-prep - - puppet-lint + - puppet-lint: + project: '{name}' publishers: - console-log