Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2015-07-16 18:58:17 +0000
committerFrank Becker2015-07-16 18:58:17 +0000
commit251a6070860223f7341ee3e6c324c83c52c93f08 (patch)
treeea8f11f367d1142f5d07ceeab6678667db11da53 /org.eclipse.mylyn.bugzilla.releng
parent8da0ab938a64501eac38b51e4bf552c4de2f7c5f (diff)
downloadorg.eclipse.mylyn.tasks-251a6070860223f7341ee3e6c324c83c52c93f08.tar.gz
org.eclipse.mylyn.tasks-251a6070860223f7341ee3e6c324c83c52c93f08.tar.xz
org.eclipse.mylyn.tasks-251a6070860223f7341ee3e6c324c83c52c93f08.zip
472116: update Bugzilla repository to 5.0 final
Change-Id: If768cb55028ed60ad0a11c70ca5f07061b4bfce1 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=472116
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp2
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp11
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb6
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb2
4 files changed, 15 insertions, 6 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 a2fb690ec..3d6044d6a 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -83,7 +83,7 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
* REST sites
*******************************************************************************/
- bugzilla::site { "bugzilla-rest-5.0-head":
+ bugzilla::site { "bugzilla-rest-5.0":
major => "5",
minor => "0",
micro => "",
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 3cb1b09de..1fde3fa1d 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -28,7 +28,7 @@ define bugzilla::site (
$envid = "$title",
$userOwner = $bugzilla::userOwner,
$userGroup = $bugzilla::userGroup,
- $envversion = "${major}.${minor}.${micro}",
+ $envversion = "",
$envdefault = false,
$envdefault_rest = false,
$desciptorfile = " ",
@@ -51,6 +51,15 @@ define bugzilla::site (
$branchTagInternal = "release-${major}.${minor}"
}
}
+ if ($envversion !="") {
+ $envversionInternal = $envversion
+ } else {
+ if ($micro !="") {
+ $envversionInternal = "${major}.${minor}.${micro}"
+ } else {
+ $envversionInternal = "${major}.${minor}"
+ }
+ }
if $custom_wf {
$envinfo1 = "Custom Workflow"
} elsif $custom_wf_and_status {
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb
index 3b5a83021..62566f2d7 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb
@@ -1,10 +1,10 @@
#!/bin/bash
-<% if @envversion < "5.0" %>
+<% if @envversionInternal < "5.0" %>
grep -v /mirror.hiwaay.net Bugzilla/Install/CPAN.pm >Bugzilla/Install/CPAN.tmp; mv -f Bugzilla/Install/CPAN.tmp Bugzilla/Install/CPAN.pm
<% end %>
echo "start: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
/usr/bin/perl install-module.pl Text::Wrap
-<% if @envversion > "4.5" %>
+<% if @envversionInternal > "4.5" %>
echo "start1: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
/usr/bin/perl install-module.pl DateTime::TimeZone
echo "start2: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
@@ -13,7 +13,7 @@ echo "start3: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
/usr/bin/perl install-module.pl Moo
echo "ende3: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
<% end %>
-<% if @envversion < "5.0" %>
+<% if @envversionInternal < "5.0" %>
echo "start4: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
/usr/bin/perl install-module.pl DBI
echo "ende4: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
index 782077850..5100e00bd 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
@@ -1,7 +1,7 @@
{
"type": "<%= @envtype %>",
"url": "/<%= @envid %>",
- "version": "<%= @envversion %>",
+ "version": "<%= @envversionInternal %>",
"info": "<%= @envinfo_intern %>",
"properties":{
<% if @envdefault %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"default": "1"<% end %>

Back to the top