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
Xavier Thompson
slapos
Commits
8ef54ba7
Commit
8ef54ba7
authored
Apr 10, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
fd19d98d
544521b1
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
1293 additions
and
988 deletions
+1293
-988
component/automake/automake-1.16-shebang_workaround.patch
component/automake/automake-1.16-shebang_workaround.patch
+0
-0
component/automake/buildout.cfg
component/automake/buildout.cfg
+3
-3
component/bison/buildout.cfg
component/bison/buildout.cfg
+2
-2
component/geoip2/buildout.cfg
component/geoip2/buildout.cfg
+1
-1
component/h5py/buildout.cfg
component/h5py/buildout.cfg
+2
-1
component/perl/buildout.cfg
component/perl/buildout.cfg
+5
-4
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+17
-4
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
...DefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
+13
-13
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
...test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
+3
-3
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+0
-3
software/slapos-testing/software.cfg
software/slapos-testing/software.cfg
+1
-0
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+2
-2
software/theia/python-language-server-requirements.txt
software/theia/python-language-server-requirements.txt
+19
-11
software/theia/yarn.lock
software/theia/yarn.lock
+1200
-922
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-1
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+5
-1
stack/erp5/instance-mariadb.cfg.in
stack/erp5/instance-mariadb.cfg.in
+1
-1
stack/erp5/run-zelenium-test.py.in
stack/erp5/run-zelenium-test.py.in
+0
-0
stack/slapos.cfg
stack/slapos.cfg
+16
-16
No files found.
component/automake/automake-1.1
5
-shebang_workaround.patch
→
component/automake/automake-1.1
6
-shebang_workaround.patch
View file @
8ef54ba7
File moved
component/automake/buildout.cfg
View file @
8ef54ba7
...
...
@@ -10,10 +10,10 @@ parts =
[automake]
recipe = slapos.recipe.cmmi
shared = true
md5sum =
24cd3501b6ad8cd4d7e2546f07e8b4d4
url = http
://ftp.gnu.org/gnu/automake/automake-1.15
.1.tar.xz
md5sum =
53f38e7591fa57c3d2cee682be668e5b
url = http
s://ftp.gnu.org/gnu/automake/automake-1.16
.1.tar.xz
patch-options = -p1
patches =
${:_profile_base_location_}/automake-1.1
5
-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e
${:_profile_base_location_}/automake-1.1
6
-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e
environment =
PATH=${autoconf:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
component/bison/buildout.cfg
View file @
8ef54ba7
[buildout]
extends =
../autoconf/buildout.cfg
../automake/buildout.cfg
../m4/buildout.cfg
../perl/buildout.cfg
...
...
@@ -13,9 +14,8 @@ shared = true
url = http://ftp.gnu.org/gnu/bison/bison-3.3.2.tar.xz
md5sum = c9b552dee234b2f6b66e56b27e5234c9
environment =
AUTOMAKE=${automake:location}/bin/automake
M4=${m4:location}/bin/m4
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
PATH=${
autoconf:location}/bin:${automake:location}/bin:${
perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
patch-options = -p1
patches =
${:_profile_base_location_}/01_inhibit_example_generation#ee2df22601a56d738939fa760f9dc19b
component/geoip2/buildout.cfg
View file @
8ef54ba7
...
...
@@ -17,5 +17,5 @@ rpath = ${:library-dirs}
[geolite2-country]
recipe = slapos.recipe.build:download-unpacked
url = http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz#${:md5sum}
md5sum =
2e92c3567aaad25e0f1cc8ce2c1f920d
md5sum =
9c2d927d3a9ee0220855037b0566d77a
strip-top-level-dir = true
component/h5py/buildout.cfg
View file @
8ef54ba7
...
...
@@ -7,8 +7,9 @@ parts =
h5py
[hdf5-env]
LDFLAGS = -L${hdf5:location}/lib
LDFLAGS = -L${hdf5:location}/lib
-Wl,-rpath=${hdf5:location}/lib
CPPFLAGS = -I${hdf5:location}/include
LD_LIBRARY_PATH=${hdf5:location}/lib
[h5py]
recipe = zc.recipe.egg:custom
...
...
component/perl/buildout.cfg
View file @
8ef54ba7
...
...
@@ -2,14 +2,15 @@
extends =
../gdbm/buildout.cfg
../patch/buildout.cfg
../xz-utils/buildout.cfg
parts =
perl
[perl]
recipe = slapos.recipe.cmmi
version = 5.2
6
.1
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.
bz2
md5sum =
467cd0c43514b9b5e397c8b385581f53
version = 5.2
8
.1
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.
xz
md5sum =
fbb590c305f2f88578f448581b8cf9c4
siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
patch-options = -p1
patches =
...
...
@@ -24,7 +25,7 @@ configure-command =
-Dnoextensions=ODBM_File \
-Dusethreads
environment =
PATH=${patch:location}/bin:%(PATH)s
PATH=${patch:location}/bin:
${xz-utils:location}/bin:
%(PATH)s
post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#943453b7d3ff8d49ed12d44a7f7076ee:post_make_hook
...
...
software/caddy-frontend/test/test.py
View file @
8ef54ba7
...
...
@@ -273,7 +273,7 @@ class TestDataMixin(object):
'%(group)s:%(name)s %(statename)s'
%
q
for
q
in
self
.
getSupervisorRPCServer
().
supervisor
.
getAllProcessInfo
()]))
def
assertTestData
(
self
,
runtime_data
,
hash_value
=
None
):
def
assertTestData
(
self
,
runtime_data
,
hash_value
=
None
,
msg
=
None
):
filename
=
'%s-%s.txt'
%
(
self
.
id
(),
'CADDY'
)
test_data_file
=
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'test_data'
,
filename
)
...
...
@@ -288,10 +288,13 @@ class TestDataMixin(object):
maxDiff
=
self
.
maxDiff
self
.
maxDiff
=
None
longMessage
=
self
.
longMessage
self
.
longMessage
=
True
try
:
self
.
assertMultiLineEqual
(
test_data
,
runtime_data
runtime_data
,
msg
=
msg
)
except
AssertionError
:
if
os
.
environ
.
get
(
'SAVE_TEST_DATA'
,
'0'
)
==
'1'
:
...
...
@@ -299,6 +302,7 @@ class TestDataMixin(object):
raise
finally
:
self
.
maxDiff
=
maxDiff
self
.
longMessage
=
longMessage
def
_test_file_list
(
self
,
slave_dir
,
IGNORE_PATH_LIST
):
runtime_data
=
[]
...
...
@@ -360,6 +364,7 @@ class TestDataMixin(object):
self
.
software_path
,
'bin'
,
'monitor.runpromise'
)
partition_path_list
=
glob
.
glob
(
os
.
path
.
join
(
self
.
instance_path
,
'*'
))
promise_status_list
=
[]
msg
=
[]
for
partition_path
in
sorted
(
partition_path_list
):
plugin_path_list
=
sorted
(
glob
.
glob
(
os
.
path
.
join
(
partition_path
,
'etc'
,
'plugin'
,
'*.py'
)
...
...
@@ -373,17 +378,25 @@ class TestDataMixin(object):
plugin_status
,
plugin_result
=
subprocess_status_output
([
runpromise_bin
,
'-c'
,
monitor_conf
,
'--run-only'
,
plugin
'--run-only'
,
plugin
,
'--force'
,
'--check-anomaly'
])
if
plugin_status
==
1
:
msg
.
append
(
plugin_result
)
# sanity check
if
'Checking promise %s'
%
plugin
not
in
plugin_result
:
plugin_status
=
1
msg
.
append
(
plugin_result
)
promise_status_list
.
append
(
'%s: %s'
%
(
plugin_path
[
len
(
self
.
instance_path
)
+
1
:],
plugin_status
==
0
and
'OK'
or
'ERROR'
))
self
.
assertTestData
(
'
\
n
'
.
join
(
promise_status_list
))
if
msg
:
msg
=
''
.
join
(
msg
).
strip
()
self
.
assertTestData
(
'
\
n
'
.
join
(
promise_status_list
),
msg
=
(
msg
or
None
))
def
test_promise_run_promise
(
self
):
partition_path_list
=
glob
.
glob
(
os
.
path
.
join
(
self
.
instance_path
,
'*'
))
...
...
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
View file @
8ef54ba7
...
...
@@ -3,23 +3,23 @@ T-0/etc/plugin/check-free-disk-space.py: OK
T-0/etc/plugin/monitor-bootstrap-status.py: OK
T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
T-2/etc/plugin/buildout-T-2-status.py: OK
T-2/etc/plugin/caddy_cached.py:
ERROR
T-2/etc/plugin/caddy_frontend_ipv4_http.py:
ERROR
T-2/etc/plugin/caddy_frontend_ipv4_https.py:
ERROR
T-2/etc/plugin/caddy_frontend_ipv6_http.py:
ERROR
T-2/etc/plugin/caddy_frontend_ipv6_https.py:
ERROR
T-2/etc/plugin/caddy_ssl_cached.py:
ERROR
T-2/etc/plugin/caddy_cached.py:
OK
T-2/etc/plugin/caddy_frontend_ipv4_http.py:
OK
T-2/etc/plugin/caddy_frontend_ipv4_https.py:
OK
T-2/etc/plugin/caddy_frontend_ipv6_http.py:
OK
T-2/etc/plugin/caddy_frontend_ipv6_https.py:
OK
T-2/etc/plugin/caddy_ssl_cached.py:
OK
T-2/etc/plugin/check-_test-error-log-last-day.py: OK
T-2/etc/plugin/check-_test-error-log-last-hour.py: OK
T-2/etc/plugin/check-free-disk-space.py: OK
T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
T-2/etc/plugin/monitor-bootstrap-status.py: OK
T-2/etc/plugin/monitor-httpd-listening-on-tcp.py:
ERROR
T-2/etc/plugin/monitor-httpd-listening-on-tcp.py:
OK
T-2/etc/plugin/nginx-configuration-promise.py: OK
T-2/etc/plugin/nginx_frontend_ipv4_http.py:
ERROR
T-2/etc/plugin/nginx_frontend_ipv4_https.py:
ERROR
T-2/etc/plugin/nginx_frontend_ipv6_http.py:
ERROR
T-2/etc/plugin/nginx_frontend_ipv6_https.py:
ERROR
T-2/etc/plugin/nginx_frontend_ipv4_http.py:
OK
T-2/etc/plugin/nginx_frontend_ipv4_https.py:
OK
T-2/etc/plugin/nginx_frontend_ipv6_http.py:
OK
T-2/etc/plugin/nginx_frontend_ipv6_https.py:
OK
T-2/etc/plugin/re6st-connectivity.py: OK
T-2/etc/plugin/trafficserver-cache-availability.py: ERROR
T-2/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
T-2/etc/plugin/trafficserver-cache-availability.py: OK
T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
View file @
8ef54ba7
...
...
@@ -24,18 +24,18 @@ T-2/etc/plugin/re6st-connectivity.py: OK
T-2/etc/plugin/trafficserver-cache-availability.py: OK
T-2/etc/plugin/trafficserver-port-listening.py: OK
T-3/etc/plugin/buildout-T-3-status.py: OK
T-3/etc/plugin/caddy_cached.py:
ERROR
T-3/etc/plugin/caddy_cached.py:
OK
T-3/etc/plugin/caddy_frontend_ipv4_http.py: OK
T-3/etc/plugin/caddy_frontend_ipv4_https.py: OK
T-3/etc/plugin/caddy_frontend_ipv6_http.py: OK
T-3/etc/plugin/caddy_frontend_ipv6_https.py: OK
T-3/etc/plugin/caddy_ssl_cached.py:
ERROR
T-3/etc/plugin/caddy_ssl_cached.py:
OK
T-3/etc/plugin/check-_replicate-error-log-last-day.py: OK
T-3/etc/plugin/check-_replicate-error-log-last-hour.py: OK
T-3/etc/plugin/check-free-disk-space.py: OK
T-3/etc/plugin/frontend-caddy-configuration-promise.py: OK
T-3/etc/plugin/monitor-bootstrap-status.py: OK
T-3/etc/plugin/monitor-httpd-listening-on-tcp.py:
ERROR
T-3/etc/plugin/monitor-httpd-listening-on-tcp.py:
OK
T-3/etc/plugin/nginx-configuration-promise.py: OK
T-3/etc/plugin/nginx_frontend_ipv4_http.py: OK
T-3/etc/plugin/nginx_frontend_ipv4_https.py: OK
...
...
software/slapos-sr-testing/software.cfg
View file @
8ef54ba7
...
...
@@ -131,9 +131,6 @@ mode = 640
# Recent erp5.util is needed
erp5.util = 0.4.58
# Use slapos.core <= 1.4.16 for correctly working slapos proxy
slapos.core = 1.4.15
# Various needed versions
Pillow = 5.3.0
PyNaCl = 1.3.0
...
...
software/slapos-testing/software.cfg
View file @
8ef54ba7
...
...
@@ -187,6 +187,7 @@ Pygments = 2.1.3
slapos.recipe.template = 4.3
# All depencies should be pinned.
zc.lockfile = 1.4
bcrypt = 3.1.4
dnspython = 1.15.0
funcsigs = 1.0.2
...
...
software/theia/buildout.hash.cfg
View file @
8ef54ba7
...
...
@@ -19,8 +19,8 @@ md5sum = c35e6baca37c690bce39ef43825ec42b
[yarn.lock]
filename = yarn.lock
md5sum =
eb30f0839ef6ce19b89757cf027e3302
md5sum =
fc2f20d496911241a0d9001c445d6158
[python-language-server-requirements.txt]
filename = python-language-server-requirements.txt
md5sum =
c21a684783b3e746134c3505ce00b757
md5sum =
242c8359be6893725ad2ac8e3c864eb0
software/theia/python-language-server-requirements.txt
View file @
8ef54ba7
autopep8==1.4.2
flake8==3.6.0
future==0.16.0
jedi==0.13.1
appdirs==1.4.3
attrs==18.2.0
black==18.9b0
Click==7.0
future==0.17.1
isort==4.3.4
jedi==0.13.2
mccabe==0.6.1
parso==0.3.1
pluggy==0.8.0
pycodestyle==2.4.0
mypy==0.660
mypy-extensions==0.4.1
parso==0.3.2
pluggy==0.8.1
pydocstyle==3.0.0
pyflakes==2.0.0
python-language-server==0.19.0
pyflakes==2.1.0
python-jsonrpc-server==0.1.2
-e git+https://github.com/palantir/python-language-server@50d03d5931d564e9908292ccfa21dd629ee817ba#egg=python_language_server
rope==0.11.0
six==1.1
1
.0
six==1.1
2
.0
snowballstemmer==1.2.1
yapf==0.24.0
toml==0.10.0
typed-ast==1.2.0
typeshed==0.0.1
yapf==0.25.0
software/theia/yarn.lock
View file @
8ef54ba7
This source diff could not be displayed because it is too large. You can
view the blob
instead.
stack/erp5/buildout.cfg
View file @
8ef54ba7
...
...
@@ -215,7 +215,7 @@ link-binary =
[template-run-zelenium]
< = download-base
url = ${:_profile_base_location_}/template/run-zelenium-test.py.in
[template]
recipe = slapos.recipe.template:jinja2
...
...
@@ -455,6 +455,7 @@ eggs = ${neoppod:eggs}
${scikit-learn:egg}
${scikit-image:egg}
sympy
more-itertools
${h5py:egg}
openpyxl
${statsmodels:egg}
...
...
@@ -785,6 +786,7 @@ zope.app.form = 4.0.2
Cython = 0.26.1
et-xmlfile = 1.0.1
more-itertools = 5.0.0
h5py = 2.7.1
mpmath = 0.19
openpyxl = 2.4.8
...
...
stack/erp5/buildout.hash.cfg
View file @
8ef54ba7
...
...
@@ -26,7 +26,7 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e
[template-mariadb]
filename = instance-mariadb.cfg.in
md5sum =
b27b034e7c9ab13e446e4ac59cda9f38
md5sum =
2d687117150528fb5aad503874a1ad33
[template-kumofs]
filename = instance-kumofs.cfg.in
...
...
@@ -64,6 +64,10 @@ md5sum = 886d1b004049c8dc1f89cbbfe4f95371
filename = postfix_aliases.in
md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template-run-zelenium]
filename = run-zelenium-test.py.in
md5sum = 37f94ecf60876bbe30877773dfe9828b
[template]
filename = instance.cfg.in
md5sum = 1f88fb841394a1d24b7cc01f966c7b21
...
...
stack/erp5/instance-mariadb.cfg.in
View file @
8ef54ba7
...
...
@@ -273,7 +273,7 @@ slowquery = ${monitor-directory:private}/slowquery_digest
[{{ section('resiliency-exclude-file') }}]
# Generate rdiff exclude file in case of resiliency
< = jinja2-template-base
template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n${directory:log}/**\\n${directory:tmp}/**\\n" }}' }}
template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n${directory:
mariadb-backup-incremental}/**\\n${directory:
log}/**\\n${directory:tmp}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-identity-signature-script")}}]
...
...
stack/erp5/
template/
run-zelenium-test.py.in
→
stack/erp5/run-zelenium-test.py.in
View file @
8ef54ba7
File moved
stack/slapos.cfg
View file @
8ef54ba7
...
...
@@ -142,7 +142,7 @@ slapos.libnetworkcache = 0.16
slapos.rebootstrap = 4.1
slapos.recipe.build = 0.40
slapos.recipe.cmmi = 0.10
slapos.toolbox = 0.9
1
slapos.toolbox = 0.9
2
stevedore = 1.21.0
subprocess32 = 3.5.3
unicodecsv = 0.14.1
...
...
@@ -154,7 +154,7 @@ paramiko = 2.1.3
Flask = 0.12
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
GitPython = 2.1.11
# Required by:
...
...
@@ -166,23 +166,23 @@ gitdb2 = 2.0.5
smmap2 = 2.0.5
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
PyRSS2Gen = 1.1
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
apache-libcloud = 2.4.0
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
atomize = 0.2.0
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
croniter = 0.3.25
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
dnspython = 1.15.0
# Required by:
...
...
@@ -190,11 +190,11 @@ dnspython = 1.15.0
enum34 = 1.1.6
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
erp5.util = 0.4.51
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
feedparser = 5.2.1
# Required by:
...
...
@@ -218,7 +218,7 @@ ipaddress = 1.0.18
jsonschema = 3.0.0a3
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
lockfile = 0.12.2
# Required by:
...
...
@@ -231,11 +231,11 @@ netifaces = 0.10.4
packaging = 16.8
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
passlib = 1.7.1
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
pyasn1 = 0.4.5
# Required by:
...
...
@@ -243,15 +243,15 @@ pyasn1 = 0.4.5
pycparser = 2.17
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
pycurl = 7.43.0
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
python-dateutil = 2.7.3
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
rpdb = 0.1.5
# Required by:
...
...
@@ -259,7 +259,7 @@ rpdb = 0.1.5
supervisor = 3.3.3
# Required by:
# slapos.toolbox==0.9
1
# slapos.toolbox==0.9
2
tzlocal = 1.5.1
# Required by:
...
...
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