Merge "devtools/gerrit: bump to 3.0.8, add OWNERS plugins"
diff --git a/WORKSPACE b/WORKSPACE
index 75f3901..5af740d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -126,11 +126,11 @@
)
container_pull(
- name = "gerrit-3.0.0",
+ name = "gerrit-3.0.8",
registry = "index.docker.io",
repository = "gerritcodereview/gerrit",
- tag = "3.0.0-ubuntu18",
- digest = "sha256:f107729011d8b81611e35a0ad452f21a424c1820664e9f95d135ad411e87b9bb",
+ tag = "3.0.8-ubuntu18",
+ digest = "sha256:8f58236129e6547d92502a2e9d8f40129f45f15007beaeafb59fed4faffddb3e",
)
# HTTP stuff from the Internet
@@ -217,13 +217,12 @@
gazelle_dependencies()
-# For devtools/gerrit/gerrit-oauth-provider
+# For devtools/gerrit/gerrit-oauth-provider and gerrit OWNERS plugin
git_repository(
name = "com_googlesource_gerrit_bazlets",
remote = "https://gerrit.googlesource.com/bazlets",
- commit = "8528a0df69dadf6311d8d3f81c1b693afda8bcf1",
- shallow_since = "1560842141 +0200",
+ commit = "1d381f01c853e2c02ae35430a8e294e485635d62",
)
load(
@@ -233,7 +232,9 @@
gerrit_api()
-load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", "maven_jar")
+load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", "maven_jar", "GERRIT")
+PROLOG_VERS = "1.4.3"
+JACKSON_VER = "2.9.7"
maven_jar(
name = "scribe",
@@ -247,6 +248,62 @@
sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a",
)
+maven_jar(
+ name = "jackson-core",
+ artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VER,
+ sha1 = "4b7f0e0dc527fab032e9800ed231080fdc3ac015",
+)
+maven_jar(
+ name = "jackson-databind",
+ artifact = "com.fasterxml.jackson.core:jackson-databind:" + JACKSON_VER,
+ sha1 = "e6faad47abd3179666e89068485a1b88a195ceb7",
+)
+maven_jar(
+ name = "jackson-annotations",
+ artifact = "com.fasterxml.jackson.core:jackson-annotations:" + JACKSON_VER,
+ sha1 = "4b838e5c4fc17ac02f3293e9a558bb781a51c46d",
+)
+maven_jar(
+ name = "jackson-dataformat-yaml",
+ artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:" + JACKSON_VER,
+ sha1 = "a428edc4bb34a2da98a50eb759c26941d4e85960",
+)
+maven_jar(
+ name = "snakeyaml",
+ artifact = "org.yaml:snakeyaml:1.23",
+ sha1 = "ec62d74fe50689c28c0ff5b35d3aebcaa8b5be68",
+)
+
+maven_jar(
+ name = "prolog-runtime",
+ artifact = "com.googlecode.prolog-cafe:prolog-runtime:" + PROLOG_VERS,
+ attach_source = False,
+ repository = GERRIT,
+ sha1 = "d5206556cbc76ffeab21313ffc47b586a1efbcbb",
+)
+maven_jar(
+ name = "prolog-compiler",
+ artifact = "com.googlecode.prolog-cafe:prolog-compiler:" + PROLOG_VERS,
+ attach_source = False,
+ repository = GERRIT,
+ sha1 = "f37032cf1dec3e064427745bc59da5a12757a3b2",
+)
+maven_jar(
+ name = "prolog-io",
+ artifact = "com.googlecode.prolog-cafe:prolog-io:" + PROLOG_VERS,
+ attach_source = False,
+ repository = GERRIT,
+ sha1 = "d02b2640b26f64036b6ba2b45e4acc79281cea17",
+)
+
+# Gerrit OWNERS plugins external repositories
+
+git_repository(
+ name = "com_googlesource_gerrit_plugin_owners",
+ remote = "https://gerrit.googlesource.com/plugins/owners/",
+ commit = "5e691e87b8c00a04d261a8dd313f4d16c54797e8",
+)
+
# For devtools/bazel-cache
git_repository(
diff --git a/bzl/workspace-status.sh b/bzl/workspace-status.sh
index 5450017..c039372 100755
--- a/bzl/workspace-status.sh
+++ b/bzl/workspace-status.sh
@@ -15,6 +15,7 @@
}
echo STABLE_BUILD_GERRIT-OAUTH-PROVIDER_LABEL $(rev .)
+echo STABLE_BUILD_OWNERS_LABEL $(rev .)
echo STABLE_GIT_COMMIT $(git rev-parse HEAD)
echo STABLE_GIT_VERSION $(rev .)
echo STABLE_BUILDER $(id -un)@$(hostname -f):$(pwd)
diff --git a/devtools/gerrit/BUILD b/devtools/gerrit/BUILD
index d9170c0..5d397c7 100644
--- a/devtools/gerrit/BUILD
+++ b/devtools/gerrit/BUILD
@@ -1,10 +1,12 @@
-load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
container_image(
name="with_plugins",
- base="@gerrit-3.0.0//image",
+ base="@gerrit-3.0.8//image",
files = [
"//devtools/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
+ "@com_googlesource_gerrit_plugin_owners//owners:owners.jar",
+ "@com_googlesource_gerrit_plugin_owners//owners-autoassign:owners-autoassign.jar",
],
# 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
@@ -12,22 +14,18 @@
directory = "/var/gerrit-plugins",
)
container_image(
- name="3.0.0-r7",
+ name="3.0.8",
base=":with_plugins",
files = [":entrypoint.sh"],
directory = "/",
entrypoint = ["/entrypoint.sh"],
)
-genrule(
- name = "push_latest",
- srcs = [":3.0.0-r7"],
- outs = ["version.sh"],
- executable = True,
- cmd = """
- tag=3.0.0-r7
- 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)
- """,
+container_push(
+ name = "push",
+ image = ":3.0.8",
+ format = "Docker",
+ registry = "registry.k0.hswaw.net",
+ repository = "devtools/gerrit",
+ tag = "3.0.8",
)
diff --git a/devtools/gerrit/kube/gerrit.libsonnet b/devtools/gerrit/kube/gerrit.libsonnet
index e36c7fa..eaac3a0 100644
--- a/devtools/gerrit/kube/gerrit.libsonnet
+++ b/devtools/gerrit/kube/gerrit.libsonnet
@@ -38,7 +38,7 @@
address: "gerrit@hackerspace.pl",
},
- tag: "3.0.0-r7",
+ tag: "3.0.8",
image: "registry.k0.hswaw.net/devtools/gerrit:" + cfg.tag,
resources: {
requests: {