Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2015-03-09 18:02:02 +0000
committerGerrit Code Review @ Eclipse.org2015-03-16 17:36:08 +0000
commita26e2ec4abd72c0b14c96fd634264677dcd1497f (patch)
treea2c304245bc90a10562f6f0145791f4ca027dc62 /org.eclipse.mylyn.bugzilla.releng
parentdd62414dd526d7a08da6f8f3ecd85dd52d049e2f (diff)
downloadorg.eclipse.mylyn.tasks-a26e2ec4abd72c0b14c96fd634264677dcd1497f.tar.gz
org.eclipse.mylyn.tasks-a26e2ec4abd72c0b14c96fd634264677dcd1497f.tar.xz
org.eclipse.mylyn.tasks-a26e2ec4abd72c0b14c96fd634264677dcd1497f.zip
414360: relang update for better support of more the one Bugzilla REST
instance Change-Id: I23872b807fff8056852e83e6483e0d98fda33bf4 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=414360
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp42
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp15
2 files changed, 23 insertions, 34 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 feea33337..104f3dba0 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -34,15 +34,15 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
}
bugzilla::site { "bugzilla-4.2.13-bugaliases":
- major => "4",
- minor => "2",
- branchTag => "bugzilla-4.2.13",
+ major => "4",
+ minor => "2",
+ branchTag => "bugzilla-4.2.13",
usebugaliases => true,
}
bugzilla::site { "bugzilla-4.4.8":
- major => "4",
- minor => "4",
+ major => "4",
+ minor => "4",
envdefault => true,
}
@@ -64,14 +64,15 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
major => "5",
minor => "0",
branch => "5.0",
- envversion => "5.0rc2",
+ envversion => "5.0rc2",
}
bugzilla::site { "bugzilla-master":
major => "5",
minor => "1",
branchTag => "HEAD",
- envversion => "5.1",
+ envversion => "5.1",
+ envinfo => "Master",
}
/*******************************************************************************
@@ -79,24 +80,25 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
*******************************************************************************/
bugzilla::site { "bugzilla-5.0rc2-rest":
- major => "5",
- minor => "0",
- branch => "5.0",
- branchTag => "bugzilla-5.0rc2",
- envtype => "bugzillaREST",
- rest_enabled => true,
+ major => "5",
+ minor => "0",
+ branch => "5.0",
+ branchTag => "bugzilla-5.0rc2",
+ envtype => "bugzillaREST",
+ rest_enabled => true,
envdefault_rest => true,
- envversion => "5.0rc2",
+ envversion => "5.0rc2",
testdataVersion => "Version1",
}
bugzilla::site { "bugzilla-rest-master":
- major => "5",
- minor => "1",
- branchTag => "HEAD",
- envversion => "5.1",
- envtype => "bugzillaREST",
- rest_enabled => true,
+ major => "5",
+ minor => "1",
+ branchTag => "HEAD",
+ envversion => "5.1",
+ envinfo => "Master",
+ envtype => "bugzillaREST",
+ rest_enabled => true,
testdataVersion => "Version1",
}
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 af9b7d43c..c6cedebc5 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -64,23 +64,10 @@ define bugzilla::site (
$envinfo2 = ""
}
}
- if $envinfo2 != "" {
- if $rest_enabled {
- $envinfo3 = "$envinfo2, REST enabled"
- } else {
- $envinfo3 = "$envinfo2"
- }
- } else {
- if $rest_enabled {
- $envinfo3 = "REST enabled"
- } else {
- $envinfo3 = ""
- }
- }
if $envinfo != "" {
$envinfo_intern = $envinfo
} else {
- $envinfo_intern = $envinfo3
+ $envinfo_intern = $envinfo2
}
if $major == "3" {
if $minor == "6" {

Back to the top