1
0
Fork 0

app/{gerrit,bazel-cache} -> devtools/

Change-Id: I2a98f33c76a59392e644579a1f7064a7c8eaec7c
master
q3k 2019-07-21 16:39:54 +02:00
parent c7a4755158
commit 57efce6b02
52 changed files with 12 additions and 9 deletions

View File

@ -2,6 +2,5 @@
build --host_force_python=PY2
test --host_force_python=PY2
run --host_force_python=PY2
# Required for app/gerrit/gerrit-oauth-provider
build --workspace_status_command=./bzl/workspace-status.sh
test --build_tests_only

View File

@ -143,7 +143,7 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
gazelle_dependencies()
# For app/gerrit/gerrit-oauth-provider
# For devtools/gerrit/gerrit-oauth-provider
git_repository(
name = "com_googlesource_gerrit_bazlets",

4
devtools/README Normal file
View File

@ -0,0 +1,4 @@
hscloud/devtools
================
Tools related to the review, build and test infrastructure.

View File

@ -4,7 +4,7 @@ container_image(
name="with_plugins",
base="@gerrit-3.0.0//image",
files = [
"//app/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
"//devtools/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
],
# we cannot drop it directly in /var/gerrit/plugins as that changes the
# directory owner to 0:0 and then breaks the gerrit installer that wants
@ -26,8 +26,8 @@ genrule(
executable = True,
cmd = """
tag=3.0.0-r7
docker tag bazel/app/gerrit:$$tag registry.k0.hswaw.net/app/gerrit:$$tag
docker push registry.k0.hswaw.net/app/gerrit:$$tag
docker tag bazel/devtools/gerrit:$$tag registry.k0.hswaw.net/devtools/gerrit:$$tag
docker push registry.k0.hswaw.net/devtools/gerrit:$$tag
echo -ne "#!/bin/sh\necho Pushed $$tag.\n" > $(OUTS)
""",
)

View File

@ -1,6 +1,6 @@
load("//app/gerrit/gerrit-oauth-provider/tools/bzl:junit.bzl", "junit_tests")
load("//devtools/gerrit/gerrit-oauth-provider/tools/bzl:junit.bzl", "junit_tests")
load(
"//app/gerrit/gerrit-oauth-provider/tools/bzl:plugin.bzl",
"//devtools/gerrit/gerrit-oauth-provider/tools/bzl:plugin.bzl",
"PLUGIN_DEPS",
"PLUGIN_TEST_DEPS",
"gerrit_plugin",

View File

@ -1,4 +1,4 @@
load("//app/gerrit/gerrit-oauth-provider/tools/bzl:classpath.bzl", "classpath_collector")
load("//devtools/gerrit/gerrit-oauth-provider/tools/bzl:classpath.bzl", "classpath_collector")
classpath_collector(
name = "main_classpath_collect",

View File

@ -39,7 +39,7 @@ local kube = import "../../../kube/kube.libsonnet";
},
tag: "3.0.0-r7",
image: "registry.k0.hswaw.net/app/gerrit:" + cfg.tag,
image: "registry.k0.hswaw.net/devtools/gerrit:" + cfg.tag,
resources: {
requests: {
cpu: "100m",