From 791d09be46487d82221e5200a0c9614e591c5f85 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 17 Sep 2021 10:18:31 +1000 Subject: [PATCH] gerrit: copy theme plugin from plugins/ This is a minor refactor to make a follow-on that copies static files more logical. Change-Id: Id31106a875926dd4eca31972b1fc52a1cd0b67bd --- docker/gerrit/bazel/Dockerfile | 2 ++ playbooks/zuul/gerrit/{ => files/plugins}/opendevtheme.html | 0 playbooks/zuul/gerrit/run.yaml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) rename playbooks/zuul/gerrit/{ => files/plugins}/opendevtheme.html (100%) diff --git a/docker/gerrit/bazel/Dockerfile b/docker/gerrit/bazel/Dockerfile index ea09bff335..8b9d8dc65b 100644 --- a/docker/gerrit/bazel/Dockerfile +++ b/docker/gerrit/bazel/Dockerfile @@ -21,5 +21,7 @@ COPY bazel-bin/release.war /var/gerrit/bin/gerrit.war RUN mkdir /var/gerrit/plugins && \ unzip -jo /var/gerrit/bin/gerrit.war WEB-INF/plugins/* -d /var/gerrit/plugins +# NOTE(ianw) : copied into build context by playbooks/zuul/gerrit/run.yaml COPY opendevtheme.html /var/gerrit/plugins/opendevtheme.html + COPY bazel-bin/plugins/zuul-results-summary/zuul-results-summary.jar /var/gerrit/plugins/zuul-results-summary.jar diff --git a/playbooks/zuul/gerrit/opendevtheme.html b/playbooks/zuul/gerrit/files/plugins/opendevtheme.html similarity index 100% rename from playbooks/zuul/gerrit/opendevtheme.html rename to playbooks/zuul/gerrit/files/plugins/opendevtheme.html diff --git a/playbooks/zuul/gerrit/run.yaml b/playbooks/zuul/gerrit/run.yaml index f2aed4df56..557678188b 100644 --- a/playbooks/zuul/gerrit/run.yaml +++ b/playbooks/zuul/gerrit/run.yaml @@ -36,7 +36,7 @@ - name: Install OpenDev theme plugin copy: - src: opendevtheme.html + src: plugins/opendevtheme.html dest: /home/zuul/src/gerrit.googlesource.com/gerrit/opendevtheme.html - name: Build docker image