Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2017-05-28 02:49:59 -0400
committerFrank Becker2017-05-28 02:49:59 -0400
commit0288cb4fa5380cc72c6b710b1e04b5ea919cd5dd (patch)
treeb227aab94e820aa43d84aa7d11325fd68e337b17
parent027444c29e37a0478645bd6da74185e18add8863 (diff)
downloadorg.eclipse.mylyn.tasks-0288cb4fa5380cc72c6b710b1e04b5ea919cd5dd.tar.gz
org.eclipse.mylyn.tasks-0288cb4fa5380cc72c6b710b1e04b5ea919cd5dd.tar.xz
org.eclipse.mylyn.tasks-0288cb4fa5380cc72c6b710b1e04b5ea919cd5dd.zip
517325: move form openjdk7 to openjdk8
Change-Id: I92ad7351d4f0c34137aa801df3d541466ef3097c Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=517325
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp10
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp16
2 files changed, 13 insertions, 13 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
index 7bcce82bb..d5b752071 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -86,17 +86,17 @@ class bugzilla {
require => Exec["apt-get update"],
}
+ service { "apache2":
+ ensure => running,
+ require => Package["apache2"],
+ }
+
exec { "Enable php5 module":
command => "a2enmod php5",
require => Package["libapache2-mod-php5"],
creates => "/etc/apache2/mods-enabled/php5.load",
}
- service { "apache2":
- ensure => running,
- require => Package["apache2"],
- }
-
exec { "Enable auth_digest module":
command => "a2enmod auth_digest",
require => Package["apache2"],
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 49f1fcb99..e3e227faf 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -121,7 +121,7 @@ define bugzilla::site (
onlyif => "/usr/bin/test -d $base/$bugzillaDir",
cwd => "$base/$bugzillaDir",
user => "$userOwner",
- timeout => 300,
+ timeout => 360,
logoutput => true,
require => Exec["prepare bugzilla"],
}
@@ -129,7 +129,7 @@ define bugzilla::site (
command => "git clone https://github.com/bugzilla/bugzilla $base/$bugzillaDir",
cwd => "$base",
user => "$userOwner",
- timeout => 300,
+ timeout => 360,
creates => "$base/$bugzillaDir",
require => Exec["prepare bugzilla"],
notify => Exec["end extract bugzilla $bugzillaDir"],
@@ -139,7 +139,7 @@ define bugzilla::site (
command => "git clone -b $branch https://github.com/bugzilla/bugzilla $base/$bugzillaDir",
cwd => "$base",
user => "$userOwner",
- timeout => 300,
+ timeout => 360,
creates => "$base/$bugzillaDir",
require => Exec["prepare bugzilla"],
}
@@ -148,7 +148,7 @@ define bugzilla::site (
cwd => "$base/$bugzillaDir",
user => "$userOwner",
logoutput => true,
- timeout => 300,
+ timeout => 360,
require => Exec["master $branchTagInternal git clone $bugzillaDir"],
notify => Exec["end extract bugzilla $bugzillaDir"],
}
@@ -159,7 +159,7 @@ define bugzilla::site (
onlyif => "/usr/bin/test -d $base/$bugzillaDir",
cwd => "$base/$bugzillaDir",
user => "$userOwner",
- timeout => 300,
+ timeout => 360,
logoutput => true,
require => Exec["prepare bugzilla"],
notify => Exec["end extract bugzilla $bugzillaDir"],
@@ -169,7 +169,7 @@ define bugzilla::site (
command => "git clone -b $branch https://github.com/bugzilla/bugzilla $base/$bugzillaDir",
cwd => "$base",
user => "$userOwner",
- timeout => 300,
+ timeout => 360,
creates => "$base/$bugzillaDir",
require => Exec["$branch $branchTagInternal git fetch $bugzillaDir"],
}
@@ -185,7 +185,7 @@ define bugzilla::site (
command => "git checkout $branchTagInternal",
cwd => "$base/$bugzillaDir",
user => "$userOwner",
- timeout => 300,
+ timeout => 360,
require => Exec["$branch $branchTagInternal git clone $bugzillaDir"],
notify => Exec["end extract bugzilla $bugzillaDir"],
}
@@ -210,7 +210,7 @@ define bugzilla::site (
cwd => "$base/$bugzillaDir",
creates => "$base/$bugzillaDir/CGI.out",
user => "$userOwner",
- timeout => 300,
+ timeout => 360,
require => File["$base/$bugzillaDir/installPerlModules.sh"]
}

Back to the top