From bdce124adf31ac06eb9496218d167a94de4bee82 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 10 Aug 2012 10:52:27 -0700 Subject: [PATCH] Clean up some multi-line shell builders. Change-Id: Iad9fb01c481b05a988fb7010175a7b0cf8a70854 Reviewed-on: https://review.openstack.org/11167 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../files/jenkins_job_builder/config/macros.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yml index 9e628ffd96..94bc222c6d 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yml @@ -30,9 +30,12 @@ - builder: name: gerrit-preclean - #TODO: multiline: builders: - - shell: "#!/bin/bash -xe\nrm -fr ~/.m2\nrm -fr ~/.java\n./tools/version.sh --release" + - shell: | + #!/bin/bash -xe + rm -fr ~/.m2 + rm -fr ~/.java + ./tools/version.sh --release - builder: name: gerrit-postrun @@ -52,9 +55,7 @@ - builder: name: puppet-syntax builders: - # TODO: remove blank line - shell: | - find . -iname *.pp | xargs puppet parser validate --modulepath=`pwd`/modules for f in `find . -iname *.erb` ; do erb -x -T '-' $f | ruby -c