openstack
/
project-config
Code Issues Proposed changes

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
This commit is contained in:
Khai Do 2016-11-16 13:19:53 -08:00
parent a2b9f50d12
commit ae24700d8e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/jobs/gerrit.yaml
View File

@ -22,7 +22,7 @@
buck clean buck clean
buck test --all --exclude slow buck test --all --exclude slow
buck build release 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: publishers:
- war: - war:
@ -55,7 +55,7 @@
source version.properties source version.properties
buck clean buck clean
buck build release 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: publishers:
- war: - war:

16
jenkins/jobs/projects.yaml
View File

@ -4794,27 +4794,27 @@
jobs: jobs:
- '{plugin-name}-gerrit-plugin-{plugin-branch}': - '{plugin-name}-gerrit-plugin-{plugin-branch}':
gerrit-branch: 'openstack/2.11.4' gerrit-branch: 'openstack/2.13.3'
plugin-name: 'javamelody' plugin-name: 'javamelody'
plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}' 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}': - '{plugin-name}-gerrit-plugin-{plugin-branch}':
gerrit-branch: 'openstack/2.11.4' gerrit-branch: 'openstack/2.13.3'
plugin-name: 'delete-project' plugin-name: 'delete-project'
plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}' 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}': - '{plugin-name}-gerrit-plugin-{plugin-branch}':
gerrit-branch: 'openstack/2.11.4' gerrit-branch: 'openstack/2.13.3'
plugin-name: 'importer' plugin-name: 'importer'
plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}' 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 # its plugins depend on a parent plugin. We need to build parent
# the parent plugin then build the child plugin. # the parent plugin then build the child plugin.
- '{plugin-name}-gerrit-plugin-{plugin-branch}': - '{plugin-name}-gerrit-plugin-{plugin-branch}':
gerrit-branch: 'openstack/2.11.4' gerrit-branch: 'openstack/2.13.3'
plugin-name: 'its-storyboard' plugin-name: 'its-storyboard'
plugin-project: 'https://gerrit.googlesource.com/plugins/{plugin-name}' 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-name: 'its-base'
plugin-parent-project: 'https://gerrit.googlesource.com/plugins/{plugin-parent-name}' plugin-parent-project: 'https://gerrit.googlesource.com/plugins/{plugin-parent-name}'
plugin-parent-branch: '{plugin-branch}' plugin-parent-branch: '{plugin-branch}'

8
zuul/layout.yaml
View File

@ -3919,10 +3919,10 @@ projects:
post: post:
- gerrit-package-buck - gerrit-package-buck
periodic: periodic:
- javamelody-gerrit-plugin-stable-2.11 - javamelody-gerrit-plugin-stable-2.13
- delete-project-gerrit-plugin-stable-2.11 - delete-project-gerrit-plugin-stable-2.13
- importer-gerrit-plugin-stable-2.11 - importer-gerrit-plugin-stable-2.13
- its-storyboard-gerrit-plugin-stable-2.11 - its-storyboard-gerrit-plugin-stable-2.13
- name: openstack-infra/gerritbot - name: openstack-infra/gerritbot
template: template: