Update Release Candidate

component/nxdtest/buildout.cfg

@@ -31,6 +31,6 @@ depends = ${python-prctl:egg}
 [nxdtest-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/nxdtest.git
-revision = 6f75fa90
+revision = 56e52da6
 location = ${buildout:parts-directory}/nxdtest
 git-executable = ${git:location}/bin/git

component/pygolang/buildout.cfg

@@ -109,4 +109,4 @@ init =
 
 
 [versions]
-pygolang = 0.0.9
+pygolang = 0.1

component/trafficserver/buildout.cfg

@@ -40,6 +40,11 @@ configure-options =
   --disable-hwloc
   --enable-experimental-plugins
   --disable-posix-cap
+patch-options = -p1
+# https://github.com/apache/trafficserver/pull/8545 + https://github.com/apache/trafficserver/pull/8617
+# (see https://github.com/apache/trafficserver/issues/8539 for the detail)
+patches =
+  ${:_profile_base_location_}/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch#d8ed3db3a48e97eb72aaaf7d7598a2d2
 environment =
   PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib  -lm

component/trafficserver/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch

+diff -ur trafficserver-9.1.1.orig/src/traffic_server/InkAPI.cc trafficserver-9.1.1/src/traffic_server/InkAPI.cc
+--- trafficserver-9.1.1.orig/src/traffic_server/InkAPI.cc	2021-10-29 15:38:50.000000000 +0000
++++ trafficserver-9.1.1/src/traffic_server/InkAPI.cc	2022-01-31 10:37:24.675347079 +0000
+@@ -5443,7 +5443,11 @@
+     break;
+   case HttpTransact::CACHE_LOOKUP_HIT_WARNING:
+   case HttpTransact::CACHE_LOOKUP_HIT_FRESH:
+-    *lookup_status = TS_CACHE_LOOKUP_HIT_FRESH;
++    if (HttpTransact::need_to_revalidate(&sm->t_state)) {
++      *lookup_status = TS_CACHE_LOOKUP_MISS;
++    } else {
++      *lookup_status = TS_CACHE_LOOKUP_HIT_FRESH;
++    }
+     break;
+   case HttpTransact::CACHE_LOOKUP_SKIPPED:
+     *lookup_status = TS_CACHE_LOOKUP_SKIPPED;

component/wendelin.core/buildout.cfg

@@ -50,7 +50,7 @@ CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/wendelin.core.git
 branch   = master
-revision = wendelin.core-2.0.alpha1-0-g49f826b1
+revision = wendelin.core-2.0.alpha2-1-gad6305c0
 # dir is pretty name as top-level recipe
 location = ${buildout:parts-directory}/wendelin.core
 git-executable = ${git:location}/bin/git

software/ors-amarisoft/buildout.hash.cfg

@@ -20,7 +20,7 @@ md5sum = 6ea4fa210a91c15278c847a809de5991
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = 25fae79db2b30be0f365ad967b278c3c
+md5sum = cf6c400d9fa5b0942f9be7145f77b8de
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
@@ -28,7 +28,7 @@ md5sum = fe249168a3f50b0efe6aeae39afb03ae
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = 5ec4508b02f6e7fbdbe1f37c65b9d897
+md5sum = f94c3e2f714629d9e1fc9b2f7c8eb586
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -44,11 +44,11 @@ md5sum = d33163012d6c98efc59161974c649557
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 97d9cdd07704cae36c5e4234c87025e8
+md5sum = 8cac0de54f54236e750ee85b98de8a31
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = b0df7f3b679b25d5296dd67e074364b4
+md5sum = 28cc9fc7b1fa7cccb16315a732d9a15f
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -61,7 +61,11 @@
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the MME). Must be modified if the MME runs on a different host. */
+{% if slapparameter_dict.get('mme_addr', '') %}
   gtp_addr: "{{ gtp_addr }}",
+{% else %}
+  gtp_addr: "127.0.1.1",
+{% endif %}
 
   /* high 20 bits of SIB1.cellIdentifier */
   enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},

software/ors-amarisoft/config/gnb.jinja2.cfg

@@ -42,7 +42,11 @@
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the AMF). Must be modified if the AMF runs on a different host. */
+{% if slapparameter_dict.get('mme_addr', '') %}
   gtp_addr: "{{ gtp_addr }}",
+{% else %}
+  gtp_addr: "127.0.1.1",
+{% endif %}
 
   gnb_id_bits: 28,
   gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},

software/ors-amarisoft/instance-enb-epc.jinja2.cfg

@@ -70,6 +70,12 @@ config-dl_earfcn = {{ dumps(slapparameter_dict["dl_earfcn"]) }}
 {% if slapparameter_dict.get("n_rb_dl", None) %}
 config-n_rb_dl = {{ dumps(slapparameter_dict["n_rb_dl"]) }}
 {% endif %}
+{% if slapparameter_dict.get("mme_addr", None) %}
+config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
+{% endif %}
+{% if slapparameter_dict.get("enb_id", None) %}
+config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
+{% endif %}
 
 [monitor-base-url-dict]
 lte-epc-request =  ${lte-epc-request:connection-monitor-base-url}

software/ors-amarisoft/instance-gnb-epc.jinja2.cfg

@@ -73,6 +73,12 @@ config-nr_band = {{ dumps(slapparameter_dict["nr_band"]) }}
 {% if slapparameter_dict.get("nr_bandwidth", None) %}
 config-nr_bandwidth = {{ dumps(slapparameter_dict["nr_bandwidth"]) }}
 {% endif %}
+{% if slapparameter_dict.get("mme_addr", None) %}
+config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
+{% endif %}
+{% if slapparameter_dict.get("enb_id", None) %}
+config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
+{% endif %}
 
 [monitor-base-url-dict]
 lte-epc-request =  ${lte-epc-request:connection-monitor-base-url}

software/slapos-master/software.cfg

@@ -20,10 +20,10 @@ wcfs-enable-default = true
 [local-bt5-repository]
 # Same as bt5-repository, but only local repository.
 # Used to generate bt5lists.
-list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${erp5-bin:location}/bt5 ${erp5-doc:location}/bt5 ${vifib:location}/master/bt5
+list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${erp5-bin:location}/bt5 ${erp5-doc:location}/bt5 ${vifib:location}/master/bt5 ${wendelin:location}/bt5
 
 [erp5_repository_list]
-repository_id_list = erp5 erp5-bin erp5-doc vifib/master
+repository_id_list = erp5 erp5-bin erp5-doc wendelin vifib/master
 
 [erp5]
 branch = erp5-vifib
@@ -38,6 +38,12 @@ branch = master
 repository = https://lab.nexedi.com/nexedi/slapos-bin.git
 branch = master
 
+[wendelin]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+repository = https://lab.nexedi.com/nexedi/wendelin.git
+branch = master
+
 [vifib-fix-products-paths]
 recipe = plone.recipe.command
 stop-on-error = true
@@ -56,6 +62,7 @@ dummy +=
 extra-paths +=
   ${vifib:location}/master
   ${slapos-bin:location}
+  ${wendelin:location}
 
 
 ### Overwrite recipes to introduce customized changes

stack/erp5/buildout.cfg

@@ -463,7 +463,6 @@ eggs = ${neoppod:eggs}
   requests
   responses
   threadframe
-  timerserver
   urlnorm
   uuid
   xml_marshaller
@@ -557,6 +556,10 @@ eggs = ${neoppod:eggs}
 # OpenId Connect
   oic
 
+# json schema validation
+  strict-rfc3339
+  jsonschema[format]
+
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the
 # installation of python, which we don't want on an instance
@@ -704,7 +707,6 @@ spyne = 2.12.14
 suds = 0.4
 facebook-sdk = 2.0.0
 threadframe = 0.2
-timerserver = 2.0.4
 urlnorm = 1.1.4
 uuid = 1.30
 validictory = 1.1.0
@@ -764,3 +766,8 @@ pyjwkest = 1.4.2
 alabaster = 0.7.12
 future = 0.18.2
 pycryptodomex = 3.10.1
+
+strict-rfc3339 = 0.7
+webcolors = 1.10
+rfc3987 = 1.3.8
+jsonpointer = 2.2

stack/erp5/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = 5ce9d5e99880d5db9ed339bbefe28d34
+md5sum = 70f30111e137d158aeca3d67c4abf643
 
 [site-zcml]
 filename = site.zcml
@@ -86,7 +86,7 @@ md5sum = bc821f9f9696953b10a03ad7b59a1936
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 09895deebca3206425fada3caf1d92cf
+md5sum = 5520e81f1fff3dc26568a614b595da37
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-zope.cfg.in

@@ -15,6 +15,11 @@
 {% set test_runner_node_count = slapparameter_dict['test-runner-node-count'] -%}
 {% set test_runner_random_activity_priority = slapparameter_dict['test-runner-random-activity-priority'] -%}
 {% set longrequest_logger_base_path = buildout_directory ~ '/var/log/longrequest_logger_' -%}
+{% if webdav -%}
+{%   set timerserver_interval = 0 -%}
+{% else -%}
+{%   set timerserver_interval = slapparameter_dict['timerserver-interval'] -%}
+{%- endif %}
 {% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
 {#
@@ -221,7 +226,7 @@ pem = {{dumps(storage_dict.pop(k))}}
 <= run-common
 instance-home = ${directory:instance}
 {% if wsgi -%}
-wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %} {{ ipv4 }}:${:port} '${:configuration-file}'
+wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %} {{ ipv4 }}:${:port} {% if timerserver_interval %}--timerserver-interval={{ timerserver_interval }}{% endif %} '${:configuration-file}'
 {% else -%}
 wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
 {%- endif %}
@@ -279,11 +284,6 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
 {% set large_file_threshold = slapparameter_dict['large-file-threshold']  -%}
 thread-amount = {{ thread_amount }}
 webdav = {{ dumps(webdav) }}
-{% if webdav -%}
-{%   set timerserver_interval = 0 -%}
-{% else -%}
-{%   set timerserver_interval = slapparameter_dict['timerserver-interval'] -%}
-{%- endif %}
 wsgi = {{ dumps(wsgi) }}
 timerserver-interval = {{ dumps(timerserver_interval) }}
 

stack/erp5/zope.conf.in

@@ -78,16 +78,14 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
   node-id {{ node_id }}
 </product-config>
 
-{% set timerserver_interval = parameter_dict['timerserver-interval'] -%}
-{% if timerserver_interval -%}
-{%   if parameter_dict['wsgi'] -%}
+{% if not parameter_dict['wsgi'] -%}
+{%   set timerserver_interval = parameter_dict['timerserver-interval'] -%}
+{%   if timerserver_interval -%}
 %import Products.TimerService.timerserver
-{%   else %}
-%import timerserver
-{%   endif -%}
 <timer-server>
   interval {{ timerserver_interval }}
 </timer-server>
+{%   endif %}
 
 {% endif -%}
 {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}