Fix files matcher and bazel for gerrit base image
Use latest bazel It seems 0.27 is now too old. This is what happens when I go on vacation apparently. Add in a hack to override the bazelversion. We'll remove this once https://gerrit-review.googlesource.com/c/gerrit/+/237495 lands and has been merged up. Change-Id: Ib7a6d33ce8bf8498fd5cd09b25087dc09acb8df4
This commit is contained in:
parent
9bb1c73139
commit
072fcca06f
@ -463,7 +463,7 @@
|
||||
- context: docker/gerrit/base
|
||||
repository: opendevorg/gerrit-base
|
||||
files: &gerrit-base_files
|
||||
- docker/gerrit-base/.*
|
||||
- docker/gerrit/base/.*
|
||||
|
||||
- job:
|
||||
name: system-config-upload-image-gerrit-base
|
||||
|
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM l.gcr.io/google/bazel:0.27.1 as bazel
|
||||
FROM l.gcr.io/google/bazel:0.29.1 as bazel
|
||||
|
||||
# The bazel image comes with bazel only runnable by root for some weird reason.
|
||||
# The bower build in gerrit does not work as root.
|
||||
|
@ -20,7 +20,7 @@ RUN apt-get update \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# 3000 is what the existing opendev gerrit2 user is
|
||||
# 3000 is what the existing opendev gerrit2 uid is
|
||||
RUN addgroup gerrit --gid 3000 --system \
|
||||
&& adduser \
|
||||
--system \
|
||||
|
@ -1,5 +1,6 @@
|
||||
- hosts: all
|
||||
tasks:
|
||||
|
||||
- name: Move plugin repos into gerrit tree
|
||||
command: "mv -f {{ item }} ../gerrit/plugins"
|
||||
args:
|
||||
@ -52,3 +53,9 @@
|
||||
command: "mv docker/gerrit/bazel/build-gerrit.sh /home/zuul/src/gerrit.googlesource.com/gerrit"
|
||||
args:
|
||||
chdir: /home/zuul/src/opendev.org/opendev/system-config
|
||||
|
||||
# TODO(mordred) Remove this line when
|
||||
# https://gerrit-review.googlesource.com/c/gerrit/+/237495
|
||||
# lands.
|
||||
- name: Overwrite bazel version
|
||||
shell: "echo 0.29.1 > /home/zuul/src/gerrit.googlesource.com/gerrit/.bazelversion"
|
||||
|
Loading…
x
Reference in New Issue
Block a user