Commit 1166f45e authored by Joanne Hugé's avatar Joanne Hugé

Update Release Candidate

parents cb0da890 9394886f
......@@ -4,11 +4,12 @@ extends =
[virtual-env-base]
recipe = slapos.recipe.build
_name = ${:_buildout_section_name_}
name = ${:_buildout_section_name_}
default-instance = true
init =
from zc.buildout.easy_install import working_set
import os
name = options['_name']
name = options['name']
eggs = options['eggs']
try:
scripts = "scripts = " + options['scripts']
......@@ -25,6 +26,26 @@ init =
<= python-interpreter
eggs += %(eggs)s
""" % locals())
if is_true(options.get('default-instance')):
cookbook = "{slapos-cookbook:recipe}"
self.buildout.parse("""
[.%(name)s.instance]
recipe = slapos.recipe.template
output = ${buildout:directory}/instance.cfg
depends = $%(cookbook)s
inline =
[buildout]
parts = publish
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
[publish]
recipe = slapos.cookbook:publish
activate-script = %(location)s
""" % locals())
install =
with open(location, "w") as f:
f.write(options['template'] % {
......
......@@ -8,8 +8,8 @@ parts =
recipe = slapos.recipe.cmmi
shared = true
url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz
version = 0.57.2
md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa
version = 0.62.1
md5sum = 2f5301d0e7fd5544ab0004393ba44cbe
configure-command = true
make-binary = true
post-install =
......
[buildout]
extends =
../defaults.cfg
../attr/buildout.cfg
../bzip2/buildout.cfg
../gnutls/buildout.cfg
......@@ -12,22 +13,19 @@ extends =
../meson/buildout.cfg
../ncurses/buildout.cfg
../ninja/buildout.cfg
../patch/buildout.cfg
../pkgconfig/buildout.cfg
../xorg/buildout.cfg
../zlib/buildout.cfg
../glib/buildout.cfg
[gcc]
min_version = 7.4
[qemu]
recipe = slapos.recipe.cmmi
shared = true
url = https://download.qemu.org/qemu-5.2.0.tar.xz
md5sum = 179f86928835da857c237b42f4b2df73
patches =
# backport (2021-03-20)
https://gitlab.com/qemu-project/qemu/-/commit/3eacf70bb5a83e4775ad8003cbca63a40f70c8c2.patch#c4330b02f331a827145009d85e4f6862
patch-binary = ${patch:location}/bin/patch
patch-options = -p1
url = https://download.qemu.org/qemu-7.0.0.tar.xz
md5sum = bfb5b09a0d1f887c8c42a6d5f26971ab
pre-configure =
sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build
sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build
......
......@@ -24,8 +24,8 @@ min_version = 8
[trafficserver]
recipe = slapos.recipe.cmmi
url = https://dlcdn.apache.org/trafficserver/trafficserver-9.1.1.tar.bz2
md5sum = 666945652942cce8c3ff0ae2757cc3c6
url = https://dlcdn.apache.org/trafficserver/trafficserver-9.1.2.tar.bz2
md5sum = 4dbe434e6cc2bd6ab9a0bf48af312f4b
shared = true
patch-options = -p1
configure-options =
......
......@@ -4,30 +4,15 @@ extends =
../../component/macros/virtual-env.cfg
parts =
instance
slapos-cookbook
[python]
part = python3
django-env
[django-env]
<= virtual-env-base
location = ${buildout:directory}/activate
eggs = Django
[instance]
recipe = slapos.recipe.template
output = ${buildout:directory}/instance.cfg
inline =
[buildout]
parts = publish
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
[publish]
recipe = slapos.cookbook:publish
activate-script = ${django-env:location}
[python]
part = python3
[versions]
Django = 3.2.12
......
......@@ -118,11 +118,11 @@ Technical notes
Updating boot-image-url-select
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* download the new OS installation image
* calculate it's sha512sum and store as <SHA512>
* calculate it's md5sum and store as <MD5>
* upload it to shacache
* construct download url: ``https://shacache.nxdcdn.com/<SHA512>#<MD5>``
* update the ``boot-image-url-select`` in:
* download the new OS installation image
* calculate it's sha512sum and store as <SHA512>
* calculate it's md5sum and store as <MD5>
* upload it to shacache
* construct download url: ``https://shacache.nxdcdn.com/<SHA512>#<MD5>``
* update the ``boot-image-url-select`` in:
* ``instance-kvm-input-schema.json``
* ``instance-kvm-cluster-input-schema.json``
......@@ -44,11 +44,11 @@ md5sum = d33163012d6c98efc59161974c649557
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
md5sum = 890642570bb905033d88c8ef7426850b
md5sum = aeb1e8ff149db6ecaf2734cf7dc326aa
[gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg
md5sum = f90764f76dcc707da55aa91db847d2bb
md5sum = 2830e108184cca7740e5373e9bc4920a
[ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh
......@@ -64,7 +64,7 @@ md5sum = e561ec26a70943c61557def1781cf65f
[sdr-busy-promise]
_update_hash_filename_ = promise/check_sdr_busy.py
md5sum = 9e867282d7dd80c4255e87a82a47a19d
md5sum = f7436ff76fea58e37a401d4712275422
[interface-up-promise]
_update_hash_filename_ = promise/check_interface_up.py
......
......@@ -23,7 +23,7 @@
- 'max_size': set the maximum size of the hex dump. 0 means no
hex dump. -1 means no limit.
*/
log_options: "all.level=info,all.max_size=32,file.rotate=1G,file.path={{ directory['tmp'] }}",
log_options: "all.level=debug,all.max_size=32,file.rotate=1G,file.path={{ directory['tmp'] }}",
log_filename: "{{ directory['log'] }}/enb.log",
/* Enable remote API and Web interface */
......
......@@ -17,7 +17,7 @@
#define USE_SRS 0
{
log_options: "all.level=info,all.max_size=32,file.rotate=1G,file.path={{ directory['tmp'] }}",
log_options: "all.level=debug,all.max_size=32,file.rotate=1G,file.path={{ directory['tmp'] }}",
log_filename: "{{ directory['log'] }}/gnb.log",
/* Enable remote API and Web interface */
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 30
"default": 40
},
"dl_earfcn": {
"title": "DL EARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -7,13 +7,13 @@
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number",
"default": 70
"default": 78
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number",
"default": 50
"default": 40
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
......
......@@ -17,7 +17,7 @@ class RunPromise(GenericPromise):
Sets the configuration and the periodicity.
"""
super(RunPromise, self).__init__(config)
self.setPeriodicity(minute=2)
self.setPeriodicity(minute=1)
def sense(self):
......@@ -53,4 +53,4 @@ class RunPromise(GenericPromise):
In this case, fail if two out of the last three results are negative.
"""
return self._anomaly(result_count=3, failure_amount=2)
return self._anomaly(result_count=1, failure_amount=1)
......@@ -5,12 +5,12 @@ import os
# Values: 6 (1.4 MHz), 15 (3MHz), 25 (5MHz), 50 (10MHz), 75 (15MHz), 100 (20MHz)
LTE_N_RB_DL=100
LTE_TX_GAIN=70
LTE_RX_GAIN=30
LTE_TX_GAIN=78
LTE_RX_GAIN=40
NR_BANDWIDTH=40
NR_TX_GAIN=70
NR_RX_GAIN=50
NR_TX_GAIN=78
NR_RX_GAIN=40
global_context = {
'generated_file_message': "This file was generated using a jinja2 template and the render-templates script, don't modify directly."
......
......@@ -8,15 +8,15 @@ default-dl-earfcn = 38350
default-lte-dl-freq = 1890.0
default-lte-band = 39
default-lte-n-rb-dl = 100
default-lte-tx-gain = 70
default-lte-rx-gain = 30
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-dl-nr-arfcn = 378000
default-nr-band = 39
default-nr-dl-freq = 1890.0
default-nr-bandwidth = 40
default-nr-tx-gain = 70
default-nr-rx-gain = 50
default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 1000
min-frequency = 1880.0
......
......@@ -8,15 +8,15 @@ default-dl-earfcn = 38050
default-lte-dl-freq = 2600.0
default-lte-band = 38
default-lte-n-rb-dl = 100
default-lte-tx-gain = 70
default-lte-rx-gain = 30
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-dl-nr-arfcn = 520000
default-nr-band = 38
default-nr-dl-freq = 2600.0
default-nr-bandwidth = 40
default-nr-tx-gain = 70
default-nr-rx-gain = 50
default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 2570
......
......@@ -8,15 +8,15 @@ default-dl-earfcn = 42590
default-lte-dl-freq = 3500.0
default-lte-band = 42
default-lte-n-rb-dl = 100
default-lte-tx-gain = 70
default-lte-rx-gain = 30
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-dl-nr-arfcn = 632628
default-nr-band = 78
default-nr-dl-freq = 3489.42
default-nr-bandwidth = 40
default-nr-tx-gain = 70
default-nr-rx-gain = 50
default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 3400
......
......@@ -8,15 +8,15 @@ default-dl-earfcn = 44590
default-lte-dl-freq = 3700.0
default-lte-band = 43
default-lte-n-rb-dl = 100
default-lte-tx-gain = 70
default-lte-rx-gain = 30
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-dl-nr-arfcn = 646666
default-nr-band = 78
default-nr-dl-freq = 3699.99
default-nr-bandwidth = 40
default-nr-tx-gain = 70
default-nr-rx-gain = 50
default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 3600
......
......@@ -194,7 +194,7 @@ setproctitle = 1.1.10
setuptools-dso = 1.7
rubygemsrecipe = 0.4.3
six = 1.12.0
slapos.cookbook = 1.0.244
slapos.cookbook = 1.0.246
slapos.core = 1.7.6
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0
......@@ -203,7 +203,7 @@ slapos.rebootstrap = 4.5
slapos.recipe.build = 0.54
slapos.recipe.cmmi = 0.19
slapos.recipe.template = 5.0
slapos.toolbox = 0.126
slapos.toolbox = 0.127
stevedore = 1.21.0:whl
subprocess32 = 3.5.4
unicodecsv = 0.14.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment