From ae24700d8e9b07b3bd772bd68dd7300e6b600d7a Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Wed, 16 Nov 2016 13:19:53 -0800
Subject: [PATCH] Modify jobs to build gerrit-2.13

This sets up a gerrit 2.13 build for gerrit core and its associated
plugins.

NOTICE:
1. Gerrit 2.13 build puts the release.war in
buck-out/gen/release/release.war instead of buck-out/gen/release.war
2. Currently the latest 2.13 release is 2.13.2 however we are aiming
for 2.13.3

Change-Id: Icf4b5f32594570de5a51c37c9f7bb5505b640a06
---
 jenkins/jobs/gerrit.yaml   |  4 ++--
 jenkins/jobs/projects.yaml | 16 ++++++++--------
 zuul/layout.yaml           |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jenkins/jobs/gerrit.yaml b/jenkins/jobs/gerrit.yaml
index ecadab0517..9cc4044dbd 100644
--- a/jenkins/jobs/gerrit.yaml
+++ b/jenkins/jobs/gerrit.yaml
@@ -22,7 +22,7 @@
           buck clean
           buck test --all --exclude slow
           buck build release
-          cp buck-out/gen/release.war buck-out/gen/gerrit-$PROJECT_VER.war
+          cp buck-out/gen/release/release.war buck-out/gen/gerrit-$PROJECT_VER.war
 
     publishers:
       - war:
@@ -55,7 +55,7 @@
           source version.properties
           buck clean
           buck build release
-          cp buck-out/gen/release.war buck-out/gen/gerrit-$PROJECT_VER.war
+          cp buck-out/gen/release/release.war buck-out/gen/gerrit-$PROJECT_VER.war
 
     publishers:
       - war:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 639d366676..d7a0669e32 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4794,27 +4794,27 @@
 
     jobs:
       - '{plugin-name}-gerrit-plugin-{plugin-branch}':
-          gerrit-branch: 'openstack/2.11.4'
+          gerrit-branch: 'openstack/2.13.3'
           plugin-name: 'javamelody'
           plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}'
-          plugin-branch: 'stable-2.11'
+          plugin-branch: 'stable-2.13'
       - '{plugin-name}-gerrit-plugin-{plugin-branch}':
-          gerrit-branch: 'openstack/2.11.4'
+          gerrit-branch: 'openstack/2.13.3'
           plugin-name: 'delete-project'
           plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}'
-          plugin-branch: 'stable-2.11'
+          plugin-branch: 'stable-2.13'
       - '{plugin-name}-gerrit-plugin-{plugin-branch}':
-          gerrit-branch: 'openstack/2.11.4'
+          gerrit-branch: 'openstack/2.13.3'
           plugin-name: 'importer'
           plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}'
-          plugin-branch: 'stable-2.11'
+          plugin-branch: 'stable-2.13'
       # its plugins depend on a parent plugin. We need to build parent
       # the parent plugin then build the child plugin.
       - '{plugin-name}-gerrit-plugin-{plugin-branch}':
-          gerrit-branch: 'openstack/2.11.4'
+          gerrit-branch: 'openstack/2.13.3'
           plugin-name: 'its-storyboard'
           plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}'
-          plugin-branch: 'stable-2.11'
+          plugin-branch: 'stable-2.13'
           plugin-parent-name: 'its-base'
           plugin-parent-project: 'https://gerrit.googlesource.com/plugins/{plugin-parent-name}'
           plugin-parent-branch: '{plugin-branch}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3ba2375512..209eb18b48 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3919,10 +3919,10 @@ projects:
     post:
       - gerrit-package-buck
     periodic:
-      - javamelody-gerrit-plugin-stable-2.11
-      - delete-project-gerrit-plugin-stable-2.11
-      - importer-gerrit-plugin-stable-2.11
-      - its-storyboard-gerrit-plugin-stable-2.11
+      - javamelody-gerrit-plugin-stable-2.13
+      - delete-project-gerrit-plugin-stable-2.13
+      - importer-gerrit-plugin-stable-2.13
+      - its-storyboard-gerrit-plugin-stable-2.13
 
   - name: openstack-infra/gerritbot
     template: