opendev/system-config
Code Issues Proposed changes

upgrade review-dev.o.o with gerrit v2.13.9

Browse Source 
This updates the gerrit war, plugin versions, and sets the new
accountPatchReviewDb url value to use mysql. Also uses updated Gerrit
query api paths for changeid and sha1 lookups in commentlinks.

Depends-On: Ifc04395f076200a68e6398190a0712c80e5278c6
Change-Id: Ic1a116b1608eb9134d18dad9463b9b9b142700fa
This commit is contained in:
Khai Do 2017-04-04 13:25:14 -07:00 committed by Clark Boylan
parent 78716c8efa
commit c857584ce7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/gerrit.pp
View File

@ -6,6 +6,7 @@
class openstack_project::gerrit (
$mysql_host,
$mysql_password,
$accountpatchreviewdb_url = undef,
$vhost_name = $::fqdn,
$canonicalweburl = "https://${::fqdn}/",
$git_http_url = '',
@ -174,6 +175,7 @@ class openstack_project::gerrit (
contactstore_url => $contactstore_url,
mysql_host => $mysql_host,
mysql_password => $mysql_password,
accountpatchreviewdb_url => $accountpatchreviewdb_url,
email_private_key => $email_private_key,
token_private_key => $token_private_key,
replicate_local => $replicate_local,

13
modules/openstack_project/manifests/review_dev.pp
View File

@ -45,6 +45,7 @@ class openstack_project::review_dev (
base => 'dev/',
}
$accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?user=gerrit2&password=${mysql_password}"
class { 'openstack_project::gerrit':
vhost_name => 'review-dev.openstack.org',
canonicalweburl => 'https://review-dev.openstack.org/',
@ -61,7 +62,7 @@ class openstack_project::review_dev (
ssh_replication_rsa_pubkey_contents => $ssh_replication_rsa_pubkey_contents,
email => 'review-dev@openstack.org',
war =>
'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.11.4.22.e0c0f29.war',
'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.13.9.4.2a605d5.war',
contactstore => $contactstore,
contactstore_appsec => $contactstore_appsec,
contactstore_pubkey => $contactstore_pubkey,
@ -77,6 +78,7 @@ class openstack_project::review_dev (
github_project_password => $github_project_password,
mysql_host => $mysql_host,
mysql_password => $mysql_password,
accountpatchreviewdb_url => $accountpatchreviewdb_url,
email_private_key => $email_private_key,
gitweb => false,
cgit => true,
@ -124,12 +126,12 @@ class openstack_project::review_dev (
{
name => 'changeid',
match => '(I[0-9a-f]{8,40})',
link => '/#q,$1,n,z',
link => '/#/q/$1',
},
{
name => 'gitsha',
match => '(<p>|[\\s(])([0-9a-f]{40})(</p>|[\\s.,;:)])',
html => '$1<a href=\"/#q,$2,n,z\">$2</a>$3',
html => '$1<a href=\"/#/q/$2\">$2</a>$3',
},
],
its_plugins => [
@ -187,9 +189,8 @@ class openstack_project::review_dev (
require => $::project_config::config_dir,
}
gerrit::plugin { 'javamelody': version => '1de5d37' }
gerrit::plugin { 'delete-project': version => '4b7410c' }
gerrit::plugin { 'its-storyboard': version => 'a9cb131' }
gerrit::plugin { 'javamelody': version => 'v2.13.3.e4233d6' }
gerrit::plugin { 'its-storyboard': version => '805f9ac' }
# create a file containing the ssl certificate
file { '/home/gerrit2/storyboard-dev.crt':