Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
7f3e6ba7
Commit
7f3e6ba7
authored
Nov 15, 2022
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
d984cac1
bb5c70ad
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
48 additions
and
15 deletions
+48
-15
component/fluentbit-plugin-wendelin/buildout.cfg
component/fluentbit-plugin-wendelin/buildout.cfg
+2
-2
component/mca/buildout.cfg
component/mca/buildout.cfg
+2
-2
component/proxysql/buildout.cfg
component/proxysql/buildout.cfg
+1
-1
software/fluent-bit/buildout.hash.cfg
software/fluent-bit/buildout.hash.cfg
+1
-1
software/fluent-bit/instance.cfg.in
software/fluent-bit/instance.cfg.in
+1
-1
software/fluent-bit/software.cfg
software/fluent-bit/software.cfg
+7
-1
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+2
-2
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
+1
-1
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
+1
-1
software/ors-amarisoft/test/test.jinja2.py
software/ors-amarisoft/test/test.jinja2.py
+5
-0
software/ors-amarisoft/test/testTDD1900.py
software/ors-amarisoft/test/testTDD1900.py
+5
-0
software/ors-amarisoft/test/testTDD2600.py
software/ors-amarisoft/test/testTDD2600.py
+5
-0
software/ors-amarisoft/test/testTDD3500.py
software/ors-amarisoft/test/testTDD3500.py
+5
-0
software/ors-amarisoft/test/testTDD3700.py
software/ors-amarisoft/test/testTDD3700.py
+5
-0
software/theia/test/test.py
software/theia/test/test.py
+5
-3
No files found.
component/fluentbit-plugin-wendelin/buildout.cfg
View file @
7f3e6ba7
...
...
@@ -12,8 +12,8 @@ parts =
[fluentbit-plugin-wendelin]
recipe = slapos.recipe.cmmi
share = true
url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.
1j-dev_buildout/fluentbit-plugin-wendelin-v0.1j-dev_buildout
.tar.gz
md5sum =
98cd6c892ff92cdeaffa0310840a476a
url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.
2/fluentbit-plugin-wendelin-v0.2
.tar.gz
md5sum =
4985017f5575528240bf5cd5b148396b
configure-command = echo "No configure command."
environment =
PATH=${golang1.17:location}/bin:%(PATH)s
...
...
component/mca/buildout.cfg
View file @
7f3e6ba7
...
...
@@ -12,8 +12,8 @@ parts =
[mca]
recipe = slapos.recipe.cmmi
url = https://lab.nexedi.com/nexedi/metadata-collect-agent/-/archive/v0.3.
0/metadata-collect-agent-v0.3.0
.tar.gz
md5sum =
9c1f6582848be94e99af10d31dd5e0ba
url = https://lab.nexedi.com/nexedi/metadata-collect-agent/-/archive/v0.3.
1/metadata-collect-agent-v0.3.1
.tar.gz
md5sum =
cbd6cf10f83c760cebc19bb9c1455f8e
configure-command = :
make-targets =
no-dracut
...
...
component/proxysql/buildout.cfg
View file @
7f3e6ba7
...
...
@@ -47,4 +47,4 @@ environment =
patch-options = -p1
patches =
# PR #3402 (mariadb_client: backport patch to fix syntax error in cmake 3.20)
https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch#
bb034744fd9b676484d34a269ab2ed07
https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch#
34fd6366d4a75fde821cee93d25eee10
software/fluent-bit/buildout.hash.cfg
View file @
7f3e6ba7
[instance-profile]
filename = instance.cfg.in
md5sum = b
2845159dd53f942f32c4d4348934ce2
md5sum = b
548a209f2846921c3dd969c9059f28c
software/fluent-bit/instance.cfg.in
View file @
7f3e6ba7
...
...
@@ -50,6 +50,6 @@ install =
[fluent-bit-service]
recipe = slapos.cookbook:wrapper
command-line = {{ fluent_bit_location }}/bin/fluent-bit -c ${fluent-bit-config-file:location}
command-line = {{ fluent_bit_location }}/bin/fluent-bit -
e {{ fluentbit_plugin_wendelin_location }}/lib/libfluentbit_wendelin.so -
c ${fluent-bit-config-file:location}
wrapper-path = ${directory:service}/fluentbit-service
output = $${:wrapper-path}
software/fluent-bit/software.cfg
View file @
7f3e6ba7
...
...
@@ -3,12 +3,17 @@ extends =
buildout.hash.cfg
../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
../../component/fluent-bit/buildout.cfg
../../component/fluent-bit/buildout.cfg
../../component/fluentbit-plugin-wendelin/buildout.cfg
parts =
slapos-cookbook
instance-profile
[fluentbit-plugin-wendelin]
url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.1%D0%B0-wendelin/fluentbit-plugin-wendelin-v0.1%D0%B0-wendelin.tar.gz
md5sum = 9ae13adf8406b368e4acb029c73ce8b8
[instance-profile]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in
...
...
@@ -16,3 +21,4 @@ rendered = ${buildout:directory}/instance.cfg
context =
section buildout buildout
key fluent_bit_location fluent-bit:location
key fluentbit_plugin_wendelin_location fluentbit-plugin-wendelin:location
software/ors-amarisoft/buildout.hash.cfg
View file @
7f3e6ba7
...
...
@@ -20,7 +20,7 @@ md5sum = 6e5c63c35b13f8920ea13e24c27d7b50
[template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg
md5sum =
80a239305950ed76b5279647f422478f
md5sum =
42959a0525d2e06e61310836656d5de6
[template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
...
...
@@ -28,7 +28,7 @@ md5sum = 04dbc8396cb112e86d5d1564df033b82
[template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
md5sum =
dadb76e747faeea18c387109c3319dfd
md5sum =
2b589e23486661c52f379c4d9b35e7a9
[template-lte-epc]
_update_hash_filename_ = instance-epc.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
View file @
7f3e6ba7
...
...
@@ -78,7 +78,7 @@ software-type = enb
config-name = enb
{%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }}
{% endfor
-
%}
{% endfor %}
return = monitor-base-url
[monitor-base-url-dict]
...
...
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
View file @
7f3e6ba7
...
...
@@ -67,7 +67,7 @@ software-type = mme
config-name = mme
{%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }}
{% endfor
-
%}
{% endfor %}
config-slave-list = {{ dumps(slave_instance_list) }}
return = monitor-base-url epc-ipv6
...
...
software/ors-amarisoft/test/test.jinja2.py
View file @
7f3e6ba7
...
...
@@ -220,6 +220,7 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
...
...
@@ -230,8 +231,10 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
...
...
@@ -242,8 +245,10 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
...
...
software/ors-amarisoft/test/testTDD1900.py
View file @
7f3e6ba7
...
...
@@ -220,6 +220,7 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
...
...
@@ -230,8 +231,10 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
...
...
@@ -242,8 +245,10 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
...
...
software/ors-amarisoft/test/testTDD2600.py
View file @
7f3e6ba7
...
...
@@ -220,6 +220,7 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
...
...
@@ -230,8 +231,10 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
...
...
@@ -242,8 +245,10 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
...
...
software/ors-amarisoft/test/testTDD3500.py
View file @
7f3e6ba7
...
...
@@ -220,6 +220,7 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
...
...
@@ -230,8 +231,10 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
...
...
@@ -242,8 +245,10 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
...
...
software/ors-amarisoft/test/testTDD3700.py
View file @
7f3e6ba7
...
...
@@ -220,6 +220,7 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
...
...
@@ -230,8 +231,10 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
...
...
@@ -242,8 +245,10 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
...
...
software/theia/test/test.py
View file @
7f3e6ba7
...
...
@@ -311,10 +311,12 @@ class TestTheiaWithEmbeddedInstance(TheiaTestCase):
self
.
assertSupplied
(
sr_url
,
info
=
proxy_info
)
name
=
'embedded_instance'
self
.
assertIn
(
name
,
self
.
captureSlapos
(
'service'
,
'list'
,
text
=
True
))
info
=
self
.
captureSlapos
(
'service'
,
'info'
,
name
,
text
=
True
)
self
.
assertIn
(
sr_url
,
info
)
info
=
json
.
loads
(
self
.
captureSlapos
(
'service'
,
'info'
,
name
,
text
=
True
))
self
.
assertEqual
(
info
[
'software-url'
],
sr_url
)
# XXX: slapos service info does not show the software type, so we check in
# slapos proxy show output
self
.
assertIn
(
sr_type
,
proxy_info
)
self
.
assert
In
(
repr
(
config
).
replace
(
"u'"
,
"'"
),
info
)
self
.
assert
Equal
(
info
[
'instance-parameters'
],
config
)
def
assertNotEmbedded
(
self
,
sr_url
,
sr_type
,
config
):
sr_url
=
self
.
expandUrl
(
sr_url
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment