diff options
author | Kelley Spoon <kelley.spoon@linaro.org> | 2018-07-19 09:36:31 -0500 |
---|---|---|
committer | Kelley Spoon <kelley.spoon@linaro.org> | 2018-07-20 11:26:27 +0000 |
commit | 98e4186dbcf9960073b735bf2efa06c330cad381 (patch) | |
tree | 6dd4d57442f610bf3722b9382296bccacd71db14 | |
parent | d23a39e2771dd355766c3d2e8c747edebdc07d89 (diff) |
Gerrit: force download of plugins on gerrit upgrade
Moves the downloading of external plugins to 'configure-gerrit'
handler in order to force updating modules.
Change-Id: Ie23f87dd83c7dcc7447f792078af1e9728c63c46
Reviewed-on: https://review.linaro.org/27488
Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
-rw-r--r-- | group_vars/gerrit | 1 | ||||
-rw-r--r-- | roles/gerrit/tasks/configure.yml | 23 | ||||
-rw-r--r-- | roles/gerrit/tasks/gerrit.yml | 11 |
3 files changed, 24 insertions, 11 deletions
diff --git a/group_vars/gerrit b/group_vars/gerrit index 071f6c6f..c7f2b9ee 100644 --- a/group_vars/gerrit +++ b/group_vars/gerrit @@ -1,3 +1,4 @@ +--- gerrit_plugin_version: 2.15 # Adjust only major version, so 2.12, 2.13 etc. gerrit_managed: no gerrit_version: 2.15.3 diff --git a/roles/gerrit/tasks/configure.yml b/roles/gerrit/tasks/configure.yml index 7f996bfc..415f77b2 100644 --- a/roles/gerrit/tasks/configure.yml +++ b/roles/gerrit/tasks/configure.yml @@ -32,6 +32,29 @@ command: chdir={{gerrit_root}} java -jar bin/gerrit.war init --batch --install-plugin={{item}} with_items: "{{gerrit_included_plugins}}" +- name: Install Gerrit plugins (non-master) + get_url: + url: https://gerrit-ci.gerritforge.com/view/Plugins-stable-{{gerrit_plugin_version}}/job/plugin-{{item}}-bazel-stable-{{gerrit_plugin_version}}/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/{{item}}/{{item}}.jar + dest: "{{gerrit_root}}/plugins/{{item}}.jar" + owner: "{{git_user}}" + group: "{{git_user}}" + validate_certs: no + force: yes + with_items: + - reviewers + - javamelody + +- name: Install Gerrit plugins (master) + get_url: + url: https://gerrit-ci.gerritforge.com/view/Plugins-master/job/plugin-{{item}}-bazel-master-master/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/{{item}}/{{item}}.jar + dest: "{{gerrit_root}}/plugins/{{item}}.jar" + owner: "{{git_user}}" + group: "{{git_user}}" + validate_certs: no + force: yes + with_items: + - oauth + - name: Check for Gerrit index stat: path={{gerrit_root}}/index/gerrit_index.config register: gerrit_index diff --git a/roles/gerrit/tasks/gerrit.yml b/roles/gerrit/tasks/gerrit.yml index 3d61b024..e968bd2e 100644 --- a/roles/gerrit/tasks/gerrit.yml +++ b/roles/gerrit/tasks/gerrit.yml @@ -29,17 +29,6 @@ notify: - restart-gerrit -- name: Install Gerrit plugins (non-master) - get_url: url=https://gerrit-ci.gerritforge.com/view/Plugins-stable-{{gerrit_plugin_version}}/job/plugin-{{item}}-bazel-stable-{{gerrit_plugin_version}}/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/{{item}}/{{item}}.jar dest={{gerrit_root}}/plugins/{{item}}.jar owner={{git_user}} group={{git_user}} validate_certs=no - with_items: - - reviewers - - javamelody - -- name: Install Gerrit plugins (master) - get_url: url=https://gerrit-ci.gerritforge.com/view/Plugins-master/job/plugin-{{item}}-bazel-master-master/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/{{item}}/{{item}}.jar dest={{gerrit_root}}/plugins/{{item}}.jar owner={{git_user}} group={{git_user}} validate_certs=no - with_items: - - oauth - - name: Install Gerrit automation crontab template: src=gerrit-automate dest=/etc/cron.d/ owner=root |