summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Copeland <ben.copeland@linaro.org>2017-11-06 13:09:47 +0000
committerBen Copeland <ben.copeland@linaro.org>2017-11-08 10:12:42 +0000
commit2ddd4949aae7733fa14b54ed47bdc22f532ad3fe (patch)
tree7798c46ed8de9e15dcb986bffc9f3009f1a0b1fb
parent377c27d8b605d0b8e47c8d7be03d71828c45e4f9 (diff)
Gerrit: Fix Plugin URL path and add tag for gerrit-setup
Change-Id: I6013e5de401b772d2cfaac4514422c1aae07ce8d Reviewed-on: https://review.linaro.org/22210 Reviewed-by: Ben Copeland <ben.copeland@linaro.org>
-rw-r--r--per-service/git-servers/gerrit.yml2
-rw-r--r--per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/per-service/git-servers/gerrit.yml b/per-service/git-servers/gerrit.yml
index 673aa142..6d17d6d8 100644
--- a/per-service/git-servers/gerrit.yml
+++ b/per-service/git-servers/gerrit.yml
@@ -14,7 +14,7 @@
# any useful generic bits still
# - apache-website
- postgres
- - gerrit-setup
+ - {role: gerrit-setup, tags: [gerrit]}
- {role: apache-site, src: "{{gerrit_host}}.conf", config: "{{gerrit_host}}", tags: [apache, website-conf] }
- apache-conf
- {role: apache-auth, host_name: "{{gerrit_host}}", when: server_access == "private", tags: [apache-auth, website-conf]}
diff --git a/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml b/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml
index 47c81a2b..88282728 100644
--- a/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml
+++ b/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml
@@ -59,7 +59,7 @@
command: chdir={{gerrit_root}} java -jar bin/gerrit.war reindex
- name: Install Gerrit plugins
- 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}}.jar dest={{gerrit_root}}/plugins/{{item}} owner={{git_user}} group={{git_user}}
+ 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