From 86c341137a6646f172fcba9b21f280c5a080be5e Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Mon, 27 May 2024 18:23:34 +0200 Subject: [PATCH] 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29945 Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- meta-agl-core/conf/templates/base/local.conf.sample | 12 +++++++++++- templates/feature/agl-ci/99_local.conf.inc | 6 ++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/meta-agl-core/conf/templates/base/local.conf.sample b/meta-agl-core/conf/templates/base/local.conf.sample index be49ed00d..5e9de61b3 100644 --- a/meta-agl-core/conf/templates/base/local.conf.sample +++ b/meta-agl-core/conf/templates/base/local.conf.sample @@ -279,9 +279,15 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl" # # A shared hash equivalent server can be set with ":" format # +# local only #BB_HASHSERVE = "auto" #BB_SIGNATURE_HANDLER = "OEEquivHash" - +# +# online/upstream r/o +#AGL_HOST_HASHSERV = "prserv.automotivelinux.org" +#BB_SIGNATURE_HANDLER = "OEEquivHash" +#BB_HASHSERVE = "auto" +#BB_HASHSERVE_UPSTREAM = "${AGL_HOST_HASHSERV}:8888" # The network based PR service host and port # Uncomment the following lines to enable PRservice. @@ -289,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" +# +# r/o upstream prserv +#AGL_HOST_PRSERV = "prserv.automotivelinux.org" +#PRSERV_HOST = "prserv.automotivelinux.org:8686" # 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 c12cd1717..af1724adb 100644 --- a/templates/feature/agl-ci/99_local.conf.inc +++ b/templates/feature/agl-ci/99_local.conf.inc @@ -24,10 +24,12 @@ INHERIT += "buildstats-summary" #AGL_HOST_PRSERV ?= "10.30.72.18" #AGL_HOST_HASHSERV ?= "10.30.72.18" -#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383" +# r/w hashserv +#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8787" #BB_SIGNATURE_HANDLER = "OEEquivHash" -#PRSERV_HOST = "${AGL_HOST_PRSERV}:8181" +# r/w prserv +#PRSERV_HOST = "${AGL_HOST_PRSERV}:8585" IMAGE_INSTALL:append = " curl" -- 2.16.6