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: I178fd2ff67847136045f5f6a684389fd0fd2f21a
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29987
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
ci-image-build: Jenkins Job builder account

diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
index af1724a..5f60ed0 100644 (file)
--- 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}:8787"
-#BB_SIGNATURE_HANDLER = "OEEquivHash"
+BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8787"
+BB_SIGNATURE_HANDLER = "OEEquivHash"
 
 # r/w prserv
-#PRSERV_HOST = "${AGL_HOST_PRSERV}:8585"
+PRSERV_HOST = "${AGL_HOST_PRSERV}:8585"
 
 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 (file)
index 0000000..e64c8e2
--- /dev/null
+++ b/templates/feature/agl-prhash-public/99_local.conf.inc
@@ -0,0 +1,13 @@
+# 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}:8888"
+BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+# r/o prserv
+PRSERV_HOST = "${AGL_HOST_PRSERV}:8686"
+
+IMAGE_INSTALL:append = " curl"