summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-06-17 17:38:52 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-06-18 10:11:56 +0000
commit12d80fd8cd73f5b67c20383a26f62c29debce052 (patch)
treea917c89bdb6bc8d5488384a541850804fb57256b
parent5b7d795f02b0c04af5ad891351a7db4aaf594b3e (diff)
Re-enable PRserv and HASHserv after api migration
The new services were deployed and can be enabled. Add a feature agl-prhash-public to enable use. Bug-AGL: SPEC-5173 Change-Id: I552fcc170748ce0c7ef6b4537beaceb97333f1a7 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29995 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account
-rw-r--r--templates/feature/agl-ci/99_local.conf.inc10
-rw-r--r--templates/feature/agl-prhash-public/99_local.conf.inc11
2 files changed, 16 insertions, 5 deletions
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
index 06402ef52..68b5e0707 100644
--- a/templates/feature/agl-ci/99_local.conf.inc
+++ b/templates/feature/agl-ci/99_local.conf.inc
@@ -21,15 +21,15 @@ INHERIT += "buildstats"
INHERIT += "buildstats-summary"
# setup for PRSERV and HASHSERV
-#AGL_HOST_PRSERV ?= "10.30.72.18"
-#AGL_HOST_HASHSERV ?= "10.30.72.18"
+AGL_HOST_PRSERV ?= "10.30.72.18"
+AGL_HOST_HASHSERV ?= "10.30.72.18"
# r/w hashserv
-#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383"
-#BB_SIGNATURE_HANDLER = "OEEquivHash"
+BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383"
+BB_SIGNATURE_HANDLER = "OEEquivHash"
# r/w prserv
-#PRSERV_HOST = "${AGL_HOST_PRSERV}:8181"
+PRSERV_HOST = "${AGL_HOST_PRSERV}:8181"
IMAGE_INSTALL:append = " curl"
diff --git a/templates/feature/agl-prhash-public/99_local.conf.inc b/templates/feature/agl-prhash-public/99_local.conf.inc
new file mode 100644
index 000000000..c82b0f4cf
--- /dev/null
+++ b/templates/feature/agl-prhash-public/99_local.conf.inc
@@ -0,0 +1,11 @@
+# setup for PRSERV and HASHSERV
+AGL_HOST_PRSERV ?= "prserv.automotivelinux.org"
+AGL_HOST_HASHSERV ?= "prserv.automotivelinux.org"
+
+# r/o hashserv
+BB_HASHSERVE = "auto"
+BB_HASHSERVE_UPSTREAM = "${AGL_HOST_HASHSERV}:8484"
+BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+# r/o prserv
+PRSERV_HOST = "${AGL_HOST_PRSERV}:8282"