Document r/o and r/w PRserv and HASHserv in the templates

This adds sections for the PRserv and HASHserv in the local.conf templates (for r/o upstream).
Also we add comments to the r/w part that is reserved for CI.

Change-Id: Id39b11bc9664b441f5dcae3646259401b5d9a6aa
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29941
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account

diff --git a/templates/base/local.conf.sample b/templates/base/local.conf.sample
index 7f2c0b1..bc55b3d 100644 (file)
--- a/templates/base/local.conf.sample
+++ b/templates/base/local.conf.sample
@@ -280,9 +280,14 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
 #
 # A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
 #
 #
 # A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
 #

+# local only

 #BB_HASHSERVE = "auto"
 #BB_SIGNATURE_HANDLER = "OEEquivHash"
 #BB_HASHSERVE = "auto"
 #BB_SIGNATURE_HANDLER = "OEEquivHash"

-
+#
+# online/upstream r/o
+#AGL_HOST_HASHSERV = "prserv.automotivelinux.org"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8484"

 
 # The network based PR service host and port
 # Uncomment the following lines to enable PRservice.
 
 # The network based PR service host and port
 # Uncomment the following lines to enable PRservice.


@@ -290,6 +295,10 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
 # start local PRService.
 # Set to other values to use remote PRService.
 #PRSERV_HOST = "localhost:0"
 # start local PRService.
 # Set to other values to use remote PRService.
 #PRSERV_HOST = "localhost:0"

+#
+# r/o upstream prserv
+#AGL_HOST_PRSERV = "prserv.automotivelinux.org"
+#PRSERV_HOST = "prserv.automotivelinux.org:8282"

 
 
 # Archive the source and put them to ${DEPLOY_DIR}/sources/.
 
 
 # Archive the source and put them to ${DEPLOY_DIR}/sources/.

diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
index 37e0ce3..06402ef 100644 (file)
--- a/templates/feature/agl-ci/99_local.conf.inc
+++ b/templates/feature/agl-ci/99_local.conf.inc
@@ -24,9 +24,11 @@ INHERIT += "buildstats-summary"
 #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"
 
 IMAGE_INSTALL:append = " curl"
 #PRSERV_HOST = "${AGL_HOST_PRSERV}:8181"
 
 IMAGE_INSTALL:append = " curl"