Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2015-05-08 17:01:13 +0000
committerFrank Becker2015-05-08 17:04:21 +0000
commit6edf650671f7b35b5abc0533fc23d5b3bb9a5e67 (patch)
tree692cf82e39890af626632da7d48821bd0c04fdc0 /org.eclipse.mylyn.bugzilla.releng
parent328a6b25a3df95116c67b479688c2a918f36da75 (diff)
downloadorg.eclipse.mylyn.tasks-6edf650671f7b35b5abc0533fc23d5b3bb9a5e67.tar.gz
org.eclipse.mylyn.tasks-6edf650671f7b35b5abc0533fc23d5b3bb9a5e67.tar.xz
org.eclipse.mylyn.tasks-6edf650671f7b35b5abc0533fc23d5b3bb9a5e67.zip
464954: update of Bugzilla to Version 5.0rc3+
Change-Id: I92c183bfbc92b7166190106eee808e81ab07ea04 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=464954
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp11
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp2
2 files changed, 8 insertions, 5 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 ab54f1501..2582bb264 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -66,10 +66,11 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
branch => "5.0",
envversion => "5.0rc3",
}
-
+
bugzilla::site { "bugzilla-master":
major => "5",
minor => "1",
+ branch => "master",
branchTag => "HEAD",
envversion => "5.1",
envinfo => "Master",
@@ -79,21 +80,23 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
* REST sites
*******************************************************************************/
- bugzilla::site { "bugzilla-5.0rc3-rest":
+ bugzilla::site { "bugzilla-rest-5.0-head":
major => "5",
minor => "0",
branch => "5.0",
- branchTag => "bugzilla-5.0rc3",
+ branchTag => "HEAD",
envtype => "bugzillaREST",
rest_enabled => true,
envdefault_rest => true,
- envversion => "5.0rc3",
+ envversion => "5.0rc3+",
testdataVersion => "Version1",
}
+
bugzilla::site { "bugzilla-rest-master":
major => "5",
minor => "1",
+ branch => "master",
branchTag => "HEAD",
envversion => "5.1",
envinfo => "Master",
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 c6cedebc5..16263838d 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -132,7 +132,7 @@ define bugzilla::site (
}
exec { "$branch $branchTag git clone $version":
- command => "git clone http://git.mozilla.org/bugzilla/bugzilla $base/$version",
+ command => "git clone -b $branch http://git.mozilla.org/bugzilla/bugzilla $base/$version",
cwd => "$base",
user => "$userOwner",
timeout => 300,

Back to the top