Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2013-04-27 11:48:40 +0000
committerFrank Becker2013-04-27 11:48:40 +0000
commit3f06de687d2aa99e29671cb119821c336d734fcf (patch)
treec0c8a14f1ae412f3c03452de522fdd795f76bdad /org.eclipse.mylyn.bugzilla.releng
parent2afb23e0e13a0bccd2906ed29c953f6bbe22a72b (diff)
downloadorg.eclipse.mylyn.tasks-3f06de687d2aa99e29671cb119821c336d734fcf.tar.gz
org.eclipse.mylyn.tasks-3f06de687d2aa99e29671cb119821c336d734fcf.tar.xz
org.eclipse.mylyn.tasks-3f06de687d2aa99e29671cb119821c336d734fcf.zip
399803: Bugzilla puppet configuration should be reproducible
* update to latest version from 3.6.x stream * properties are now used Change-Id: I004bd7ee2189a594b32dc86e55d09f74ec2952cc Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=399803
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp13
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp29
2 files changed, 24 insertions, 18 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
index d1bad0f66..1cc29f3b2 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -28,25 +28,26 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
minor => "6",
}
- bugzilla::site { "bugzilla-3.6.12-custom-wf":
+ bugzilla::site { "bugzilla-3.6.13-custom-wf":
major => "3",
minor => "6",
- branchTag => "bugzilla-3.6.12",
+ branchTag => "bugzilla-3.6.13",
custom_wf => true,
}
- bugzilla::site { "bugzilla-3.6.12-custom-wf-and-status":
+ bugzilla::site { "bugzilla-3.6.13-custom-wf-and-status":
major => "3",
minor => "6",
- branchTag => "bugzilla-3.6.12",
+ branchTag => "bugzilla-3.6.13",
custom_wf_and_status => true,
+ xmlrpc_enabled => false,
desciptorfile => "DescriptorFile-custom-wf-and-status.txt"
}
- bugzilla::site { "bugzilla-3.6.12-xml-rpc-disabled":
+ bugzilla::site { "bugzilla-3.6.13-xml-rpc-disabled":
major => "3",
minor => "6",
- branchTag => "bugzilla-3.6.12",
+ branchTag => "bugzilla-3.6.13",
xmlrpc_enabled => false,
}
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 6f055fe72..980895962 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -37,24 +37,29 @@ define bugzilla::site (
$propertyanz = 0
$confDir = "$base/conf.d"
+
if $branch == "trunk" {
- $envinfo = "trunk"
+ $envinfo1 = "trunk"
+ } elsif $custom_wf {
+ $envinfo1 = "Custom Workflow"
+ } elsif $custom_wf_and_status {
+ $envinfo1 = "Custom Workflow and Status"
} else {
- if $xmlrpc_enabled {
- if $custom_wf {
- $envinfo = "Custom Workflow"
- } else {
- if $custom_wf_and_status {
- $envinfo = "Custom Workflow and Status"
- } else {
- $envinfo = ""
- }
- }
+ $envinfo1 = ""
+ }
+ if $envinfo1 != "" {
+ if !$xmlrpc_enabled {
+ $envinfo = "$envinfo1, XML-RPC disabled"
} else {
+ $envinfo = "$envinfo1"
+ }
+ } else {
+ if !$xmlrpc_enabled {
$envinfo = "XML-RPC disabled"
+ } else {
+ $envinfo = ""
}
}
-
if $major == "3" {
if $minor == "6" {
$VersionCreateName = "name"

Back to the top