From 3639d7b5357cd825a699af711305b19f9ddaebe1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 18 May 2021 07:48:02 -0700 Subject: [PATCH] Remove special x/ handling patch in gerrit Upstream Gerrit has been fixing this up. It's in 3.2 as of https://gerrit-review.googlesource.com/c/gerrit/+/306519 Change-Id: Ie8196c38629b4893364b969aeb6ac466cff0c93f --- docker/gerrit/patches/serve-x-normally.patch | 13 ------------- playbooks/zuul/gerrit/run.yaml | 9 --------- 2 files changed, 22 deletions(-) delete mode 100644 docker/gerrit/patches/serve-x-normally.patch diff --git a/docker/gerrit/patches/serve-x-normally.patch b/docker/gerrit/patches/serve-x-normally.patch deleted file mode 100644 index c7c0d6c336..0000000000 --- a/docker/gerrit/patches/serve-x-normally.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/java/com/google/gerrit/httpd/raw/StaticModule.java b/java/com/google/gerrit/httpd/raw/StaticModule.java -index 414a120194..9d59535a66 100644 ---- a/java/com/google/gerrit/httpd/raw/StaticModule.java -+++ b/java/com/google/gerrit/httpd/raw/StaticModule.java -@@ -71,7 +71,7 @@ public class StaticModule extends ServletModule { - "/c/*", - "/p/*", - "/q/*", -- "/x/*", -+ //"/x/*", - "/admin/*", - "/dashboard/*", - "/groups/self", diff --git a/playbooks/zuul/gerrit/run.yaml b/playbooks/zuul/gerrit/run.yaml index cccd2466ac..f2aed4df56 100644 --- a/playbooks/zuul/gerrit/run.yaml +++ b/playbooks/zuul/gerrit/run.yaml @@ -1,14 +1,5 @@ - hosts: all tasks: - - name: Patch Gerrit's webapp routes to not shadow x/ - shell: | - set -ex - GERRIT_BASE=/home/zuul/src/gerrit.googlesource.com/gerrit - SYSTEM_CONFIG_BASE=/home/zuul/src/opendev.org/opendev/system-config - # Disable the x/ redirection since we have x/ projects - patch $GERRIT_BASE/java/com/google/gerrit/httpd/raw/StaticModule.java \ - $SYSTEM_CONFIG_BASE/docker/gerrit/patches/serve-x-normally.patch - - name: Build gerrit include_role: name: bazelisk-build