Commit 8d35c235 authored by Jérome Perrin's avatar Jérome Perrin

slapos-sr-testing: use slapos.core from git [WIP]

this is not for master, once we release slapos.core let's just update
egg version here.
parent 3c25b4d0
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../../component/bcrypt/buildout.cfg ../../component/bcrypt/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/curl/buildout.cfg ../../component/curl/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/pillow/buildout.cfg ../../component/pillow/buildout.cfg
...@@ -15,8 +16,8 @@ extends = ...@@ -15,8 +16,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 +103,22 @@ setup = ${slapos-repository:location}/software/nextcloud/test/ ...@@ -102,16 +103,22 @@ 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-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}
...@@ -149,6 +156,10 @@ forbid-download-cache = true ...@@ -149,6 +156,10 @@ forbid-download-cache = true
repository = https://lab.nexedi.com/nexedi/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
[slapos.core-repository]
<= git-clone-repository
repository = https://lab.nexedi.com/nexedi/slapos.core.git
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
...@@ -156,6 +167,9 @@ output = ${buildout:directory}/template.cfg ...@@ -156,6 +167,9 @@ output = ${buildout:directory}/template.cfg
mode = 640 mode = 640
[versions] [versions]
# Use latest slapos.core
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