Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2014-03-04 13:34:52 +0000
committerFrank Becker2014-03-04 13:34:52 +0000
commitd7ba5f7aba05b5730423d3b6b20beb244e4e703e (patch)
treeb02c4a4107c037bb102a6bfae23d2e2427f64040
parentdc3d736e97f2ccbb63fb0f9c524126be16f7ce4d (diff)
downloadorg.eclipse.mylyn.tasks-d7ba5f7aba05b5730423d3b6b20beb244e4e703e.tar.gz
org.eclipse.mylyn.tasks-d7ba5f7aba05b5730423d3b6b20beb244e4e703e.tar.xz
org.eclipse.mylyn.tasks-d7ba5f7aba05b5730423d3b6b20beb244e4e703e.zip
428805: build failures due to Bugzilla tests
Change-Id: Id0457013d2ae009ad3333291393536c1a4152f17 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=428805
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp13
1 files changed, 12 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
index 736f7110d..3786dd135 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -100,13 +100,24 @@ define bugzilla::site (
}
if $branchTag == "trunk" {
+#
+# always delete existing trunk folders to get the latest version from the trunk
+#
+ exec { "delete bugzilla $version":
+ command => "rm -R $base/$version",
+ cwd => "$base",
+ user => "root",
+ timeout => 300,
+ logoutput => true,
+ require => Exec["prepare bugzilla"]
+ }
exec { "extract bugzilla $version":
command => "bzr co bzr://bzr.mozilla.org/bugzilla/$branchName $version",
cwd => "$base",
user => "$userOwner",
timeout => 300,
creates => "$base/$version",
- require => Exec["prepare bugzilla"]
+ require => Exec["delete bugzilla $version"]
}
} else {
exec { "extract bugzilla $version":

Back to the top