Commit 49fbf4bf authored by Joanne Hugé's avatar Joanne Hugé

Update Release Candidate

parents 19a4fb56 5881d9d2
...@@ -12,7 +12,7 @@ python = python ...@@ -12,7 +12,7 @@ python = python
[python] [python]
recipe = slapos.recipe.build recipe = slapos.recipe.build
part = python2.7 part = python3
init = init =
python = self.buildout[options['part']] python = self.buildout[options['part']]
for x in 'location', 'executable', 'version': for x in 'location', 'executable', 'version':
......
...@@ -14,8 +14,8 @@ extends = ...@@ -14,8 +14,8 @@ extends =
[fish-shell] [fish-shell]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/fish-shell/fish-shell/releases/download/3.5.0/fish-3.5.0.tar.xz url = https://github.com/fish-shell/fish-shell/releases/download/3.5.1/fish-3.5.1.tar.xz
md5sum = aea858def631da76e1313936e79651fd md5sum = 59950f8ec9bf9e2fa02ff205dc5a9c57
configure-command = ${cmake:location}/bin/cmake configure-command = ${cmake:location}/bin/cmake
configure-options = configure-options =
-DCMAKE_INSTALL_PREFIX=${:location} -DCMAKE_INSTALL_PREFIX=${:location}
......
...@@ -7,5 +7,3 @@ recipe = slapos.recipe.cmmi ...@@ -7,5 +7,3 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://download-mirror.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.13.tar.gz url = http://download-mirror.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.13.tar.gz
md5sum = 4bc15e65fef99db64e27f4cd369ae02e md5sum = 4bc15e65fef99db64e27f4cd369ae02e
configure-options =
--disable-static
...@@ -26,4 +26,4 @@ location = ${:output} ...@@ -26,4 +26,4 @@ location = ${:output}
<= go-git-package <= go-git-package
go.importpath = github.com/restic/restic go.importpath = github.com/restic/restic
repository = https://github.com/restic/restic repository = https://github.com/restic/restic
revision = v0.9.6 revision = v0.14.0-0-g1bc87e17
...@@ -19,7 +19,7 @@ md5sum = 8157c22134200bd862a07c6521ebf799 ...@@ -19,7 +19,7 @@ md5sum = 8157c22134200bd862a07c6521ebf799
[yarn.lock] [yarn.lock]
_update_hash_filename_ = yarn.lock _update_hash_filename_ = yarn.lock
md5sum = db6372aa3895f1d4359c97f47993cd33 md5sum = f961f8ef90e9a02543b4231af4fbd5cc
[ms-python-disable-jedi-buildout.patch] [ms-python-disable-jedi-buildout.patch]
_update_hash_filename_ = ms-python-disable-jedi-buildout.patch _update_hash_filename_ = ms-python-disable-jedi-buildout.patch
......
This diff is collapsed.
...@@ -9,8 +9,8 @@ extends = ...@@ -9,8 +9,8 @@ extends =
[tig] [tig]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/jonas/tig/releases/download/tig-2.5.5/tig-2.5.5.tar.gz url = https://github.com/jonas/tig/releases/download/tig-2.5.7/tig-2.5.7.tar.gz
md5sum = 0902ba706e8efaf6c2087d8b66393375 md5sum = 307e966837370ba698286a1c48d31a7f
environment = environment =
CFLAGS=-I${ncurses:location}/include -I${libiconv:location}/include CFLAGS=-I${ncurses:location}/include -I${libiconv:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libiconv:location}/lib -Wl,-rpath=${libiconv:location}/lib LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libiconv:location}/lib -Wl,-rpath=${libiconv:location}/lib
...@@ -8,8 +8,8 @@ parts += ...@@ -8,8 +8,8 @@ parts +=
[tmux] [tmux]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://github.com/tmux/tmux/releases/download/2.9a/tmux-2.9a.tar.gz url = https://github.com/tmux/tmux/releases/download/3.3a/tmux-3.3a.tar.gz
md5sum = f0564dbf4cf6b301c4845219d27ed3ad md5sum = 8eee5883b9f6550fa4efaad0c9ec38f3
shared = true shared = true
environment = environment =
CFLAGS=-I${ncurses:location}/include -I${libevent2:location}/include/ CFLAGS=-I${ncurses:location}/include -I${libevent2:location}/include/
......
...@@ -27,6 +27,9 @@ parts = ...@@ -27,6 +27,9 @@ parts =
template-crontab-line template-crontab-line
slapos-cookbook slapos-cookbook
[python]
part = python2.7
[rssgen-eggs] [rssgen-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = python-${:_buildout_section_name_} interpreter = python-${:_buildout_section_name_}
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
############################################################################## ##############################################################################
import httplib
import json import json
import os import os
import requests import requests
...@@ -54,7 +53,7 @@ class TestBackupServer(InstanceTestCase): ...@@ -54,7 +53,7 @@ class TestBackupServer(InstanceTestCase):
# XXX crontab not triggered yet # XXX crontab not triggered yet
self.assertEqual( self.assertEqual(
[httplib.NOT_FOUND, False], [requests.codes.not_found, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
...@@ -65,6 +64,6 @@ class TestBackupServer(InstanceTestCase): ...@@ -65,6 +64,6 @@ class TestBackupServer(InstanceTestCase):
result = requests.get( result = requests.get(
parameter_dict['monitor-base-url'], verify=False, allow_redirects=False) parameter_dict['monitor-base-url'], verify=False, allow_redirects=False)
self.assertEqual( self.assertEqual(
[httplib.UNAUTHORIZED, False], [requests.codes.unauthorized, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
...@@ -15,6 +15,9 @@ parts = ...@@ -15,6 +15,9 @@ parts =
matiec matiec
open62541 open62541
[python]
part = python2.7
[open62541] [open62541]
# Beremiz need it to be in folder parts/open62541 # Beremiz need it to be in folder parts/open62541
# as Beremiz search for open62541 to BEREMIZ_PATH/../open62541 # as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
......
...@@ -8,6 +8,9 @@ parts = ...@@ -8,6 +8,9 @@ parts =
template template
download-cache = ${:directory}/download-cache download-cache = ${:directory}/download-cache
[python]
part = python2.7
[template] [template]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
......
...@@ -6,6 +6,9 @@ parts = ...@@ -6,6 +6,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[slapos.buildout-repository] [slapos.buildout-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.buildout.git repository = https://lab.nexedi.com/nexedi/slapos.buildout.git
......
...@@ -22,9 +22,6 @@ parts += ...@@ -22,9 +22,6 @@ parts +=
caddyprofiledeps caddyprofiledeps
kedifa kedifa
[python]
part = python3
[kedifa] [kedifa]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
......
...@@ -7,6 +7,9 @@ parts += ...@@ -7,6 +7,9 @@ parts +=
instance instance
caucase-eggs caucase-eggs
[python]
part = python2.7
[instance-caucased] [instance-caucased]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -29,7 +29,7 @@ from __future__ import unicode_literals ...@@ -29,7 +29,7 @@ from __future__ import unicode_literals
import json import json
import os import os
import requests import requests
import httplib
from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
...@@ -51,7 +51,7 @@ class TestCaucase(SlapOSInstanceTestCase): ...@@ -51,7 +51,7 @@ class TestCaucase(SlapOSInstanceTestCase):
) )
result = requests.get(connection_parameter_dict['url']) result = requests.get(connection_parameter_dict['url'])
self.assertEqual(result.status_code, httplib.OK) self.assertEqual(result.status_code, requests.codes.ok)
self.assertEqual( self.assertEqual(
result.json(), result.json(),
{ {
......
...@@ -6,6 +6,9 @@ parts = ...@@ -6,6 +6,9 @@ parts =
${cloudooo-buildout:parts} ${cloudooo-buildout:parts}
template-cloudooo template-cloudooo
[python]
part = python2.7
[cloudooo-software-parameter-dict] [cloudooo-software-parameter-dict]
publish-url-name = cloudooo publish-url-name = cloudooo
port-parameter-name = tcpv4-port port-parameter-name = tcpv4-port
......
...@@ -8,6 +8,9 @@ parts = ...@@ -8,6 +8,9 @@ parts =
slapos-cookbook slapos-cookbook
instance.cfg instance.cfg
[python]
part = python2.7
[instance.cfg] [instance.cfg]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${buildout:directory}/${:_buildout_section_name_} output = ${buildout:directory}/${:_buildout_section_name_}
......
...@@ -11,9 +11,6 @@ parts = ...@@ -11,9 +11,6 @@ parts =
location = ${buildout:directory}/activate location = ${buildout:directory}/activate
eggs = Django eggs = Django
[python]
part = python3
[versions] [versions]
Django = 4.0.6 Django = 4.0.6
sqlparse = 0.4.2 sqlparse = 0.4.2
......
...@@ -17,6 +17,9 @@ parts = ...@@ -17,6 +17,9 @@ parts =
# Always build GCC for Fortran (see openblas). # Always build GCC for Fortran (see openblas).
max_version = 0 max_version = 0
[python]
part = python2.7
[instance] [instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -16,3 +16,7 @@ ...@@ -16,3 +16,7 @@
[template-erp5testnode] [template-erp5testnode]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 681f4159e4ac2542d0fbc7a894e43d79 md5sum = 681f4159e4ac2542d0fbc7a894e43d79
[template-resilient-test]
filename = instance-kvm-resilient-test.cfg.jinja2
md5sum = bfa3dcf9b44a4ccb4bda595859ecbbf7
...@@ -11,8 +11,6 @@ url = http://www.nexedi.org/static/slapos/kvm_resiliency_test/virtual.qcow.gz ...@@ -11,8 +11,6 @@ url = http://www.nexedi.org/static/slapos/kvm_resiliency_test/virtual.qcow.gz
md5sum = dd82c771f6f7738fb4b0fc1330ed8236 md5sum = dd82c771f6f7738fb4b0fc1330ed8236
[template-resilient-test] [template-resilient-test]
filename = instance-kvm-resilient-test.cfg.jinja2
md5sum = 5f255502973530181ee45d93fa00a3c4
# Ingest extra-context, on a the final template-resilient-test rendering # Ingest extra-context, on a the final template-resilient-test rendering
# always ingest raw values. # always ingest raw values.
extra-context = extra-context =
......
[instance-profile]
filename = instance.cfg.in
md5sum = 21ea6fe8ebb6b7baf7e26c0f4c13ebcd
[buildout]
parts =
fluentbit-service
eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
offline = true
[directory]
recipe = slapos.cookbook:mkdirectory
home = ${buildout:directory}
etc = ${:home}/etc
var = ${:home}/var
script = ${:etc}/run/
service = ${:etc}/service
promise = ${:etc}/promise/
log = ${:var}/log
bin = ${:home}/bin
[fluentbit-service]
recipe = slapos.cookbook:wrapper
command-line = {{ fluentbit_source_location }}/build/bin/fluent-bit -i cpu -o stdout
wrapper-path = ${directory:service}/fluentbit-service
output = $${:wrapper-path}
[buildout]
extends =
buildout.hash.cfg
../../stack/slapos.cfg
../../component/cmake/buildout.cfg
../../component/bison/buildout.cfg
../../component/flex/buildout.cfg
parts =
slapos-cookbook
fluent-bit
instance-profile
[instance-profile]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/instance.cfg
context =
section buildout buildout
key fluentbit_source_location fluent-bit:location
[fluent-bit]
recipe = slapos.recipe.cmmi
url = https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.7.tar.gz
environment =
PATH=${bison:location}/bin:${flex:location}/bin:${fluent-bit:location}:%(PATH)s
location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-command =
cd build && ${cmake:location}/bin/cmake .. -DFLB_CONFIG_YAML=Off .
make-targets =
make-binary =
cd build && make
...@@ -9,9 +9,6 @@ parts = ...@@ -9,9 +9,6 @@ parts =
instance-profile instance-profile
slapos-cookbook slapos-cookbook
[python]
part = python3
[template-base] [template-base]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -10,9 +10,6 @@ parts = ...@@ -10,9 +10,6 @@ parts =
eggs eggs
instance-cfg instance-cfg
[python]
part = python3
# eggs for instance.cfg # eggs for instance.cfg
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
...@@ -71,7 +71,8 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261 ...@@ -71,7 +71,8 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
<= nodejs-8.12.0 <= nodejs-8.12.0
[yarn] [yarn]
<= yarn-1.3.2 <= yarn-1.3.2
[python]
part = python2.7
############################ ############################
# Software compilation # # Software compilation #
......
...@@ -21,13 +21,9 @@ parts = ...@@ -21,13 +21,9 @@ parts =
loki-config-file loki-config-file
promtail-config-file promtail-config-file
[python]
part = python3
[nodejs] [nodejs]
<= nodejs-14.16.0 <= nodejs-14.16.0
[go_github.com_grafana_grafana] [go_github.com_grafana_grafana]
<= go-git-package <= go-git-package
go.importpath = github.com/grafana/grafana go.importpath = github.com/grafana/grafana
......
...@@ -13,9 +13,6 @@ parts = ...@@ -13,9 +13,6 @@ parts =
slapos-cookbook slapos-cookbook
template-cfg template-cfg
[python]
part = python3
[template-cfg] [template-cfg]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
......
...@@ -6,6 +6,9 @@ parts = ...@@ -6,6 +6,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[file] [file]
# For old GCC like 4.9.2 on Debian 8. # For old GCC like 4.9.2 on Debian 8.
# XXX: This should be moved to component/rina-tools/buildout.cfg, next to where # XXX: This should be moved to component/rina-tools/buildout.cfg, next to where
......
...@@ -29,9 +29,6 @@ parts = ...@@ -29,9 +29,6 @@ parts =
helloweb-go helloweb-go
[python]
part = python3
[gowork] [gowork]
golang = ${golang1.17:location} golang = ${golang1.17:location}
......
...@@ -15,6 +15,9 @@ parts = ...@@ -15,6 +15,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
########################################################## ##########################################################
# Service startup scripts and configuration files # Service startup scripts and configuration files
########################################################## ##########################################################
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
############################################################################## ##############################################################################
import httplib
import json import json
import os import os
import requests import requests
...@@ -53,7 +52,7 @@ class TestHtmlValidatorServer(InstanceTestCase): ...@@ -53,7 +52,7 @@ class TestHtmlValidatorServer(InstanceTestCase):
parameter_dict['vnu-url'], verify=False, allow_redirects=False) parameter_dict['vnu-url'], verify=False, allow_redirects=False)
self.assertEqual( self.assertEqual(
[httplib.OK, False, 'Apache-Coyote/1.1'], [requests.codes.ok, False, 'Apache-Coyote/1.1'],
[result.status_code, result.is_redirect, result.headers['Server']] [result.status_code, result.is_redirect, result.headers['Server']]
) )
...@@ -64,7 +63,7 @@ class TestHtmlValidatorServer(InstanceTestCase): ...@@ -64,7 +63,7 @@ class TestHtmlValidatorServer(InstanceTestCase):
result = requests.get( result = requests.get(
parameter_dict['monitor-base-url'], verify=False, allow_redirects=False) parameter_dict['monitor-base-url'], verify=False, allow_redirects=False)
self.assertEqual( self.assertEqual(
[httplib.UNAUTHORIZED, False], [requests.codes.unauthorized, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
......
...@@ -12,9 +12,6 @@ parts = ...@@ -12,9 +12,6 @@ parts =
hugo hugo
template-cfg template-cfg
[python]
part = python3
[profile-common] [profile-common]
nginx_location = ${nginx:location} nginx_location = ${nginx:location}
dash_location = ${dash:location} dash_location = ${dash:location}
......
...@@ -16,6 +16,9 @@ parts = ...@@ -16,6 +16,9 @@ parts =
jscrawler-build jscrawler-build
instance instance
[python]
part = python2.7
[nodejs] [nodejs]
<= nodejs-12.18.3 <= nodejs-12.18.3
......
...@@ -29,6 +29,9 @@ parts = ...@@ -29,6 +29,9 @@ parts =
openssl openssl
instance instance
[python]
part = python2.7
[nodejs] [nodejs]
<= nodejs-14.16.0 <= nodejs-14.16.0
...@@ -36,8 +39,8 @@ parts = ...@@ -36,8 +39,8 @@ parts =
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
erp5.util erp5.util
urllib3[secure]
selenium selenium
certifi
${lxml-python:egg} ${lxml-python:egg}
interpreter = pythonwitheggs interpreter = pythonwitheggs
...@@ -128,4 +131,4 @@ output = ${buildout:directory}/template-nginx.cfg.in ...@@ -128,4 +131,4 @@ output = ${buildout:directory}/template-nginx.cfg.in
output = ${buildout:directory}/runTestSuite.in output = ${buildout:directory}/runTestSuite.in
[versions] [versions]
selenium = 3.14.1 selenium = 3.141.0
...@@ -26,9 +26,11 @@ ...@@ -26,9 +26,11 @@
############################################################################## ##############################################################################
import httplib import glob
import json import json
import os import os
import subprocess
import requests import requests
from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
...@@ -59,7 +61,7 @@ class TestJSTestNode(InstanceTestCase): ...@@ -59,7 +61,7 @@ class TestJSTestNode(InstanceTestCase):
result = requests.get( result = requests.get(
'%sjio/test/tests.html' % (connection_dict['nginx'], ), allow_redirects=False) '%sjio/test/tests.html' % (connection_dict['nginx'], ), allow_redirects=False)
self.assertEqual( self.assertEqual(
[httplib.OK, False], [requests.codes.ok, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
...@@ -67,7 +69,7 @@ class TestJSTestNode(InstanceTestCase): ...@@ -67,7 +69,7 @@ class TestJSTestNode(InstanceTestCase):
result = requests.get( result = requests.get(
'%srenderjs/test/' % (connection_dict['nginx'], ), allow_redirects=False) '%srenderjs/test/' % (connection_dict['nginx'], ), allow_redirects=False)
self.assertEqual( self.assertEqual(
[httplib.OK, False], [requests.codes.ok, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
...@@ -75,7 +77,7 @@ class TestJSTestNode(InstanceTestCase): ...@@ -75,7 +77,7 @@ class TestJSTestNode(InstanceTestCase):
result = requests.get( result = requests.get(
'%srsvp/test/index.html' % (connection_dict['nginx'], ), allow_redirects=False) '%srsvp/test/index.html' % (connection_dict['nginx'], ), allow_redirects=False)
self.assertEqual( self.assertEqual(
[httplib.OK, False], [requests.codes.ok, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
...@@ -83,6 +85,18 @@ class TestJSTestNode(InstanceTestCase): ...@@ -83,6 +85,18 @@ class TestJSTestNode(InstanceTestCase):
result = requests.get( result = requests.get(
'http://[%s]:9443' % (self._ipv6_address, ), allow_redirects=False) 'http://[%s]:9443' % (self._ipv6_address, ), allow_redirects=False)
self.assertEqual( self.assertEqual(
[httplib.FORBIDDEN, False], [requests.codes.forbidden, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
def test_runTestSuite(self):
runTestSuite_output = subprocess.check_output(
[
os.path.join(
self.computer_partition_root_path,
'bin',
'runTestSuite',
),
'--help',
])
self.assertTrue(runTestSuite_output)
...@@ -12,8 +12,6 @@ parts += ...@@ -12,8 +12,6 @@ parts +=
jupyter-notebook-initialized-scripts jupyter-notebook-initialized-scripts
instance instance
[python]
part = python3
[gcc] [gcc]
# Always build GCC for Fortran (see openblas). # Always build GCC for Fortran (see openblas).
......
...@@ -40,9 +40,6 @@ parts = ${:common-parts} ...@@ -40,9 +40,6 @@ parts = ${:common-parts}
#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu #XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
[python]
part = python3
[python-with-eggs] [python-with-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = ${:_buildout_section_name_} interpreter = ${:_buildout_section_name_}
......
...@@ -14,9 +14,6 @@ parts = ...@@ -14,9 +14,6 @@ parts =
slapos-cookbook slapos-cookbook
instance-profile instance-profile
[python]
part = python3
[java] [java]
<= java-re-temurin-11 <= java-re-temurin-11
......
...@@ -15,9 +15,6 @@ parts = ...@@ -15,9 +15,6 @@ parts =
template template
template-monitor template-monitor
[python]
part = python3
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -21,10 +21,6 @@ parts += ...@@ -21,10 +21,6 @@ parts +=
[gcc] [gcc]
min_version = 0 min_version = 0
[python]
# we need python3 for repo/cros_sdk command
part = python3
[eggs] [eggs]
# name is python3 so that cros_sdk uses it automatically through "/usr/bin/env python3" # name is python3 so that cros_sdk uses it automatically through "/usr/bin/env python3"
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
...@@ -29,6 +29,9 @@ parts = ...@@ -29,6 +29,9 @@ parts =
neoppod neoppod
slapos-cookbook slapos-cookbook
[python]
part = python2.7
[neoppod-repository] [neoppod-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/neoppod.git repository = https://lab.nexedi.com/nexedi/neoppod.git
......
...@@ -47,6 +47,8 @@ parts = ...@@ -47,6 +47,8 @@ parts =
slapos-cookbook slapos-cookbook
instance.cfg instance.cfg
[python]
part = python2.7
[neo] [neo]
<= go-git-package <= go-git-package
......
...@@ -12,9 +12,6 @@ parts = ...@@ -12,9 +12,6 @@ parts =
nginx-push-stream nginx-push-stream
template template
[python]
part = python3
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
......
...@@ -48,7 +48,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149 ...@@ -48,7 +48,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg] [enb.jinja2.cfg]
filename = config/enb.jinja2.cfg filename = config/enb.jinja2.cfg
md5sum = faed74244d0c539dea53a0377ad0e103 md5sum = 8029046031f17da3f81ace017ba193c9
[sib23.asn] [sib23.asn]
filename = config/sib23.asn filename = config/sib23.asn
...@@ -56,7 +56,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a ...@@ -56,7 +56,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
[gnb.jinja2.cfg] [gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg filename = config/gnb.jinja2.cfg
md5sum = a9df6d3d66bf5a48ed2bc1dc7084291a md5sum = 7f7c8ddf242027bddc3e84c7a0c74474
[ltelogs.jinja2.sh] [ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh filename = ltelogs.jinja2.sh
...@@ -64,7 +64,7 @@ md5sum = 1ba2e065bdf14a6411e95e80db17dcfd ...@@ -64,7 +64,7 @@ md5sum = 1ba2e065bdf14a6411e95e80db17dcfd
[mme.jinja2.cfg] [mme.jinja2.cfg]
filename = config/mme.jinja2.cfg filename = config/mme.jinja2.cfg
md5sum = 0c1e086de705f074654a794a2248cad0 md5sum = 21e24367dd8213a00f6c777df33d5c03
[ims.jinja2.cfg] [ims.jinja2.cfg]
filename = config/ims.jinja2.cfg filename = config/ims.jinja2.cfg
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#define N_ANTENNA_UL 2 #define N_ANTENNA_UL 2
{ {
log_options: "all.level=debug,all.max_size=32,file.rotate=1G,file.path=/dev/null", log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,file.rotate=1G,file.path=/dev/null",
log_filename: "{{ directory['log'] }}/enb.log", log_filename: "{{ directory['log'] }}/enb.log",
rf_driver: { rf_driver: {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define NR_LONG_PUCCH_FORMAT 2 // Values: 2, 3, 4 #define NR_LONG_PUCCH_FORMAT 2 // Values: 2, 3, 4
{ {
log_options: "all.level=debug,all.max_size=32,file.rotate=1G,file.path=/dev/null", log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,rrc.level=debug,rrc.max_size=1,file.rotate=1G,file.path=/dev/null",
log_filename: "{{ directory['log'] }}/gnb.log", log_filename: "{{ directory['log'] }}/gnb.log",
rf_driver: { rf_driver: {
......
{ {
log_options: "all.level=debug,all.max_size=32,file.rotate=1G,file.path=/dev/null", log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,ngap.level=debug,ngap.max_size=1,file.rotate=1G,file.path=/dev/null",
log_filename: "{{ directory['log'] }}/mme.log", log_filename: "{{ directory['log'] }}/mme.log",
{% if slapparameter_dict.get('external_enb_gnb', '') %} {% if slapparameter_dict.get('external_enb_gnb', '') %}
......
...@@ -21,6 +21,9 @@ parts += ...@@ -21,6 +21,9 @@ parts +=
# apache-php # apache-php
# logrotate # logrotate
[python]
part = python2.7
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -15,9 +15,6 @@ parts = ...@@ -15,9 +15,6 @@ parts =
slapos-cookbook slapos-cookbook
instance instance
[python]
part = python3
[instance] [instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -10,9 +10,6 @@ parts = ...@@ -10,9 +10,6 @@ parts =
slapos-cookbook slapos-cookbook
eggs eggs
[python]
part = python3
[gcc] [gcc]
# powerdns needs a compiler with C++17 features # powerdns needs a compiler with C++17 features
min_version = 8 min_version = 8
......
...@@ -12,9 +12,6 @@ parts = ...@@ -12,9 +12,6 @@ parts =
proftpd-config-file proftpd-config-file
instance-profile instance-profile
[python]
part = python3
[download-file-base] [download-file-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -10,11 +10,6 @@ parts = ...@@ -10,11 +10,6 @@ parts =
slapos-cookbook slapos-cookbook
instance-profile instance-profile
[python]
part = python3
# force to install plone.recipe.command as it will be used during instanciation # force to install plone.recipe.command as it will be used during instanciation
[slapos-cookbook] [slapos-cookbook]
eggs += eggs +=
......
...@@ -17,6 +17,9 @@ parts += ...@@ -17,6 +17,9 @@ parts +=
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[re6stnet-repository] [re6stnet-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/re6stnet.git repository = https://lab.nexedi.com/nexedi/re6stnet.git
......
...@@ -35,9 +35,6 @@ parts = ...@@ -35,9 +35,6 @@ parts =
[mariadb] [mariadb]
location = ${mariadb-10.4:location} location = ${mariadb-10.4:location}
[python]
part = python3
[template-mysqld-wrapper] [template-mysqld-wrapper]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${buildout:parts-directory}/${:_buildout_section_name_}/mysqld.in output = ${buildout:parts-directory}/${:_buildout_section_name_}/mysqld.in
......
...@@ -17,9 +17,6 @@ parts = ...@@ -17,9 +17,6 @@ parts =
restic restic
gowork gowork
[python]
part = python3
[gowork] [gowork]
install += install +=
${git.github.com_restic_rest-server:location}:./cmd/... ${git.github.com_restic_rest-server:location}:./cmd/...
......
...@@ -23,6 +23,9 @@ parts = ...@@ -23,6 +23,9 @@ parts =
collective.recipe.shelloutput collective.recipe.shelloutput
template template
[python]
part = python2.7
[collective.recipe.shelloutput] [collective.recipe.shelloutput]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
...@@ -27,6 +27,9 @@ parts = ...@@ -27,6 +27,9 @@ parts =
shared-part-list = shared-part-list =
[python]
part = python2.7
[setup-develop-egg] [setup-develop-egg]
recipe = zc.recipe.egg:develop recipe = zc.recipe.egg:develop
......
...@@ -30,6 +30,9 @@ parts = ...@@ -30,6 +30,9 @@ parts =
phantomjs phantomjs
template template
[python]
part = python2.7
[bootstrap-slapos.recipe.cmmi] [bootstrap-slapos.recipe.cmmi]
# install our develop version of slapos.recipe.cmmi before anything else, # install our develop version of slapos.recipe.cmmi before anything else,
# otherwise it will be installed from pypi by dependencies. # otherwise it will be installed from pypi by dependencies.
......
...@@ -50,6 +50,8 @@ common-parts = ...@@ -50,6 +50,8 @@ common-parts =
parts = parts =
${:common-parts} ${:common-parts}
[python]
part = python2.7
[template-base] [template-base]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance-theia] [instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in _update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum = f1b06742154b97d4173dd11e0949569d md5sum = 6ddb028e7427913fdcac34b8e727734c
[instance] [instance]
_update_hash_filename_ = instance.cfg.in _update_hash_filename_ = instance.cfg.in
...@@ -49,10 +49,6 @@ md5sum = e2f6c483cce09f87ab1e63ae8be0daf4 ...@@ -49,10 +49,6 @@ md5sum = e2f6c483cce09f87ab1e63ae8be0daf4
_update_hash_filename_ = theia_import.py _update_hash_filename_ = theia_import.py
md5sum = 1a668d6203d42b4d46d56e24c7606cb2 md5sum = 1a668d6203d42b4d46d56e24c7606cb2
[python-language-server-requirements.txt]
_update_hash_filename_ = python-language-server-requirements.txt
md5sum = 5e1aad3426f971a01717f74d99dda841
[slapos.css.in] [slapos.css.in]
_update_hash_filename_ = slapos.css.in _update_hash_filename_ = slapos.css.in
md5sum = d2930ec3ef973b7908f0fa896033fd64 md5sum = d2930ec3ef973b7908f0fa896033fd64
......
...@@ -360,7 +360,7 @@ output = $${directory:bin}/$${:_buildout_section_name_} ...@@ -360,7 +360,7 @@ output = $${directory:bin}/$${:_buildout_section_name_}
inline = inline =
#!/bin/sh #!/bin/sh
export HOME=$${directory:home} export HOME=$${directory:home}
export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH export PATH=${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
export IPV6_SLAPRUNNER={{ ipv6_random }} export IPV6_SLAPRUNNER={{ ipv6_random }}
# Theia Backend # Theia Backend
...@@ -660,7 +660,8 @@ inline = ...@@ -660,7 +660,8 @@ inline =
"$${directory:project}/runner/**":true "$${directory:project}/runner/**":true
}, },
"git.terminalAuthentication": false, "git.terminalAuthentication": false,
"security.workspace.trust.startupPrompt": "once" "security.workspace.trust.startupPrompt": "once",
"zc-buildout.python.executable": "${python-for-buildout-languageserver:executable}"
} }
[runner-link] [runner-link]
......
aiohttp==3.8.1
aioresponses==0.7.3
aiosignal==1.2.0
astroid==2.11.6
async-timeout==4.0.2
attrs==21.4.0
cachetools==5.2.0
charset-normalizer==2.1.0
coverage[toml]==6.4.1
dill==0.3.5.1
frozenlist==1.3.0
idna==3.3
iniconfig==1.1.1
isort==5.10.1
lazy-object-proxy==1.7.1
mccabe==0.7.0
multidict==6.0.2
mypy==0.961
mypy-extensions==0.4.3
packaging==21.3
platformdirs==2.5.2
pluggy==1.0.0
py==1.11.0
py-cpuinfo==8.0.0
pydantic==1.8.2
pygls==0.11.3
pylint==2.14.3
pyparsing==3.0.9
pytest==7.1.2
pytest-asyncio==0.18.3
pytest-benchmark==3.4.1
pytest-cov==3.0.0
tomli==2.0.1
tomlkit==0.11.0
typeguard==2.13.3
types-cachetools==5.2.1
types-setuptools==57.4.18
types-toml==0.10.7
typing-extensions==4.2.0
wrapt==1.14.1
yapf==0.32.0
yarl==1.7.2
zc-buildout==2.13.7
zc.buildout.languageserver==0.8.1
...@@ -12,6 +12,7 @@ extends = ...@@ -12,6 +12,7 @@ extends =
../../component/coreutils/buildout.cfg ../../component/coreutils/buildout.cfg
../../component/fonts/buildout.cfg ../../component/fonts/buildout.cfg
../../component/theia/buildout.cfg ../../component/theia/buildout.cfg
../../component/pygolang/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
../../stack/resilient/buildout.cfg ../../stack/resilient/buildout.cfg
...@@ -29,9 +30,6 @@ shared-part-list = ...@@ -29,9 +30,6 @@ shared-part-list =
# Versions # Versions
# -------- # --------
[python]
part = python3
[gcc] [gcc]
# We keep the gcc part in sync with the one from erp5 software, so that when we install # We keep the gcc part in sync with the one from erp5 software, so that when we install
# erp5 inside theia's slapos parts can be shared. # erp5 inside theia's slapos parts can be shared.
...@@ -44,6 +42,22 @@ max_version = 0 ...@@ -44,6 +42,22 @@ max_version = 0
install += install +=
golang.org/x/tools/gopls@v0.6.6 golang.org/x/tools/gopls@v0.6.6
[versions]
aiohttp = 3.8.1:whl
aiosignal = 1.2.0
async-timeout = 4.0.2
cachetools = 5.2.0
frozenlist = 1.3.0
idna = 3.3
multidict = 6.0.2
packaging = 21.3
pydantic = 1.9.1
pygls = 0.12:whl
typeguard = 2.13.3:whl
typing-extensions = 4.3.0:whl
yarl = 1.7.2
zc.buildout.languageserver = 0.8.1
# Downloads and templates # Downloads and templates
# ----------------------- # -----------------------
...@@ -59,9 +73,6 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_} ...@@ -59,9 +73,6 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
destination = ${buildout:directory}/${:_buildout_section_name_} destination = ${buildout:directory}/${:_buildout_section_name_}
output = ${:destination} output = ${:destination}
[python-language-server-requirements.txt]
<= download-base
[slapos.css.in] [slapos.css.in]
<= download-base <= download-base
...@@ -115,20 +126,10 @@ eggs = ...@@ -115,20 +126,10 @@ eggs =
supervisor supervisor
setuptools setuptools
[python-language-server]
version = 0.19.0
recipe = plone.recipe.command
command =
PATH=${git:location}/bin/:$PATH bash -c "${python3:executable} -m venv --clear ${:location} && \
. ${:location}/bin/activate && \
pip install -r ${python-language-server-requirements.txt:output}"
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
[cli-utilities] [cli-utilities]
PATH = ${nodejs:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:${tig:location}/bin:${vim:location}/bin:${tmux:location}/bin:${git:location}/bin:${curl:location}/bin:${python:location}/bin:${buildout:bin-directory} PATH = ${nodejs:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:${tig:location}/bin:${vim:location}/bin:${tmux:location}/bin:${git:location}/bin:${curl:location}/bin:${python:location}/bin:${buildout:bin-directory}
[python-with-eggs] [python-with-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = ${:_buildout_section_name_} interpreter = ${:_buildout_section_name_}
...@@ -152,6 +153,11 @@ needs-these-eggs-scripts-in-path = ...@@ -152,6 +153,11 @@ needs-these-eggs-scripts-in-path =
${supervisor:recipe} ${supervisor:recipe}
${slapos-command:recipe} ${slapos-command:recipe}
[python-for-buildout-languageserver]
<= python-interpreter
executable = ${buildout:bin-directory}/${:interpreter}
eggs +=
zc.buildout.languageserver
[software-info] [software-info]
slapos = ${buildout:bin-directory}/slapos slapos = ${buildout:bin-directory}/slapos
......
...@@ -12,6 +12,9 @@ parts = ...@@ -12,6 +12,9 @@ parts =
util-linux util-linux
template template
[python]
part = python2.7
# eggs for instance-rsn-client.cfg # eggs for instance-rsn-client.cfg
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
...@@ -14,6 +14,8 @@ parts = ...@@ -14,6 +14,8 @@ parts =
coturn coturn
instance-cfg instance-cfg
[python]
part = python2.7
[download-base] [download-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
......
...@@ -10,6 +10,9 @@ parts = ...@@ -10,6 +10,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[template] [template]
# Default template for the instance. # Default template for the instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
...@@ -45,10 +45,6 @@ recipe = slapos.recipe.build:download-unpacked ...@@ -45,10 +45,6 @@ recipe = slapos.recipe.build:download-unpacked
# set to the relative path of this folder. # set to the relative path of this folder.
archive-root = archive-root =
[python]
part = python3
#---------------- #----------------
#-- #--
#-- Optional part allowing applications using this stack to run a custom #-- Optional part allowing applications using this stack to run a custom
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
extensions += extensions +=
slapos.rebootstrap slapos.rebootstrap
slapos.extension.strip
slapos.extension.shared slapos.extension.shared
show-picked-versions = true show-picked-versions = true
...@@ -182,21 +181,20 @@ psutil = 5.8.0 ...@@ -182,21 +181,20 @@ psutil = 5.8.0
pluggy = 0.13.1:whl pluggy = 0.13.1:whl
py = 1.9.0:whl py = 1.9.0:whl
pyOpenSSL = 19.1.0 pyOpenSSL = 19.1.0
pyparsing = 2.2.0 pyparsing = 3.0.9:whl
py-mld = 1.0.3 py-mld = 1.0.3
pyroute2 = 0.6.9 pyroute2 = 0.6.9
pytz = 2016.10 pytz = 2022.2.1
regex = 2020.9.27 regex = 2020.9.27
requests = 2.27.1 requests = 2.28.1
charset-normalizer = 2.0.12 charset-normalizer = 2.1.1
scandir = 1.10.0 scandir = 1.10.0
setproctitle = 1.1.10 setproctitle = 1.1.10
setuptools-dso = 1.7 setuptools-dso = 1.7
rubygemsrecipe = 0.4.3 rubygemsrecipe = 0.4.3
six = 1.12.0 six = 1.16.0
slapos.cookbook = 1.0.253 slapos.cookbook = 1.0.253
slapos.core = 1.7.13 slapos.core = 1.7.13
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25 slapos.libnetworkcache = 0.25
slapos.rebootstrap = 4.5 slapos.rebootstrap = 4.5
...@@ -231,7 +229,7 @@ enum34 = 1.1.10 ...@@ -231,7 +229,7 @@ enum34 = 1.1.10
erp5.util = 0.4.74 erp5.util = 0.4.74
feedparser = 5.2.1 feedparser = 5.2.1
functools32 = 3.2.3.post2 functools32 = 3.2.3.post2
attrs = 18.2.0 attrs = 22.1.0
pyrsistent = 0.16.1 pyrsistent = 0.16.1
pytest-runner = 5.2:whl pytest-runner = 5.2:whl
ipaddress = 1.0.23 ipaddress = 1.0.23
...@@ -249,18 +247,23 @@ rpdb = 0.1.5 ...@@ -249,18 +247,23 @@ rpdb = 0.1.5
supervisor = 4.1.0 supervisor = 4.1.0
tzlocal = 1.5.1 tzlocal = 1.5.1
uritemplate = 3.0.0 uritemplate = 3.0.0
zope.interface = 4.3.3 zope.interface = 5.4.0
certifi = 2020.6.20 certifi = 2022.6.15
chardet = 3.0.4 chardet = 3.0.4
urllib3 = 1.26.9 urllib3 = 1.26.12
pkgconfig = 1.5.1 pkgconfig = 1.5.1
distro = 1.7.0 distro = 1.7.0
[versions:python2] [versions:python2]
attrs = 18.2.0
click = 6.7 click = 6.7
distro = 1.6.0 distro = 1.6.0
Werkzeug = 1.0.1 Werkzeug = 1.0.1
requests = 2.27.1
charset-normalizer = 2.0.12
pyparsing = 2.2.0
certifi = 2020.04.05.1
[versions:sys.version_info < (3,8)] [versions:sys.version_info < (3,8)]
MarkupSafe = 1.0 MarkupSafe = 1.0
......
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