From 6827cea43d0f14147da4c0c028db7e30deda3b5d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Sun, 17 Sep 2017 20:40:12 -0700
Subject: [PATCH] Upgrade review.openstack.org to Gerrit 2.13

This change can't quite do the upgrade itself unfortunately. Instead the
upgrade should be performed as described at
https://etherpad.openstack.org/p/gerrit-2.13.-upgrade-steps then this
change should be merged before puppet is reenabled on that node. This
ensures that puppet wants to see the post upgrade state preventing it
from undoing anything.

Change-Id: Ide9e89542ae4203d70b5480475993d79259a3840
---
 modules/openstack_project/manifests/review.pp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 13d75f421b..0463802af6 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -91,6 +91,7 @@ class openstack_project::review (
     url  => $project_config_repo,
   }
 
+  $accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}"
   class { 'openstack_project::gerrit':
     java_home                           => $java_home,
     git_http_url                        => 'https://git.openstack.org/',
@@ -124,7 +125,7 @@ class openstack_project::review (
     httpd_maxthreads                    => '100',
     httpd_maxqueued                     => '200',
     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',
     acls_dir                            => $::project_config::gerrit_acls_dir,
     notify_impact_file                  => $::project_config::gerrit_notify_impact_file,
     projects_file                       => $::project_config::jeepyb_project_file,
@@ -135,6 +136,7 @@ class openstack_project::review (
     github_project_password             => $github_project_password,
     mysql_host                          => $mysql_host,
     mysql_password                      => $mysql_password,
+    accountpatchreviewdb_url            => $accountpatchreviewdb_url,
     email_private_key                   => $email_private_key,
     token_private_key                   => $token_private_key,
     swift_username                      => $swift_username,
@@ -178,12 +180,12 @@ class openstack_project::review (
       {
         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                        => [
@@ -292,8 +294,9 @@ class openstack_project::review (
     require                             => $::project_config::config_dir,
   }
 
-  gerrit::plugin { 'javamelody': version       => '3fefa35' }
-  gerrit::plugin { 'its-storyboard': version   => 'a9cb131' }
+  gerrit::plugin { 'javamelody': version       => 'v2.13.3.e4233d6' }
+  gerrit::plugin { 'its-storyboard': version   => '805f9ac' }
+
 
   class { 'gerritbot':
     nick                    => 'openstackgerrit',