Commit f59a7ef4 authored by Łukasz Nowak's avatar Łukasz Nowak

slapos-sr-testing: Use slapos.core from the repository

The test system requires to adapt to changes in slapos.core rapidly,
and so it has use the most recent version.
parent b4bff336
No related merge requests found
...@@ -15,8 +15,8 @@ extends = ...@@ -15,8 +15,8 @@ extends =
./buildout.hash.cfg ./buildout.hash.cfg
parts = parts =
slapos-cookbook
eggs eggs
slapos-cookbook
template template
[setup-develop-egg] [setup-develop-egg]
...@@ -102,16 +102,27 @@ setup = ${slapos-repository:location}/software/nextcloud/test/ ...@@ -102,16 +102,27 @@ setup = ${slapos-repository:location}/software/nextcloud/test/
egg = slapos.test.nextcloud egg = slapos.test.nextcloud
setup = ${slapos-repository:location}/software/turnserver/test/ setup = ${slapos-repository:location}/software/turnserver/test/
[slapos.core-repository]
<= git-clone-repository
repository = https://lab.nexedi.com/master/slapos.core.git
branch = master
[slapos.core-setup]
<= setup-develop-egg
egg = slapos.core
setup = ${slapos.core-repository:location}
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg}
${slapos.core-setup:egg}
${pillow-python:egg} ${pillow-python:egg}
erp5.util erp5.util
${python-pynacl:egg} ${python-pynacl:egg}
${python-cryptography:egg} ${python-cryptography:egg}
${bcrypt:egg} ${bcrypt:egg}
slapos.libnetworkcache slapos.libnetworkcache
slapos.core
supervisor supervisor
${slapos.cookbook-setup:egg} ${slapos.cookbook-setup:egg}
${slapos.test.caddy-frontend-setup:egg} ${slapos.test.caddy-frontend-setup:egg}
...@@ -156,6 +167,8 @@ output = ${buildout:directory}/template.cfg ...@@ -156,6 +167,8 @@ output = ${buildout:directory}/template.cfg
mode = 640 mode = 640
[versions] [versions]
# slapos.core is used from the clone always
slapos.core =
# Various needed versions # Various needed versions
Pillow = 5.3.0 Pillow = 5.3.0
PyNaCl = 1.3.0 PyNaCl = 1.3.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