Commit ed94a266 authored by Xiaowu Zhang's avatar Xiaowu Zhang

use cmmi&build dev version

should build 3 times
first two time will failed
parent af1f96ef
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
[buildout] [buildout]
extends = extends =
../../stack/slapos.cfg ../../stack/slapos-dev.cfg
../../stack/logrotate/buildout.cfg ../../stack/logrotate/buildout.cfg
../../component/cython-zstd/buildout.cfg ../../component/cython-zstd/buildout.cfg
#LXML #LXML
...@@ -21,11 +21,14 @@ extends = ...@@ -21,11 +21,14 @@ extends =
parts = parts =
# keep neoppod first so that ZODB is built correctly, # keep neoppod first so that ZODB is built correctly,
# before any other section that would depend on it # before any other section that would depend on it
slapos.recipe.build-repository
slapos.recipe.cmmi-repository
neoppod-develop neoppod-develop
neoppod neoppod
slapos-deps-eggs slapos-deps-eggs
slapos-cookbook slapos-cookbook
[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
......
...@@ -10,6 +10,25 @@ parts = ...@@ -10,6 +10,25 @@ parts =
slapos-cookbook slapos-cookbook
[git-clone-repository]
recipe = plone.recipe.command
git-binary = git
location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = (${:git-binary} clone ${:repository} ${:location})
[slapos.recipe.build-repository]
<= git-clone-repository
repository = https://lab.nexedi.com/xiaowu.zhang/slapos.recipe.build.git
branch = master
[slapos.recipe.cmmi-repository]
<= git-clone-repository
repository = https://lab.nexedi.com/xiaowu.zhang/slapos.recipe.cmmi.git
branch = master
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
...@@ -50,8 +69,14 @@ recipe = zc.recipe.egg:develop ...@@ -50,8 +69,14 @@ recipe = zc.recipe.egg:develop
egg = slapos.core egg = slapos.core
setup = ${slapos.core-repository:location} setup = ${slapos.core-repository:location}
[versions] [versions]
slapos.cookbook = slapos.cookbook =
slapos.core = slapos.core =
slapos.toolbox = slapos.toolbox =
erp5-util = erp5-util =
slapos.recipe.cmmi =
slapos.recipe.build =
...@@ -4,14 +4,21 @@ ...@@ -4,14 +4,21 @@
[buildout] [buildout]
python = python2.7 python = python2.7
shared-part = /srv/slapgrid/slappart56/srv/runner/instance/slappart0/srv/testnode/b/cache shared-part = /srv/slapgrid/slappart2/srv/runner/project/cache
eggs-directory = /srv/slapgrid/slappart56/srv/runner/instance/slappart0/srv/testnode/b/shared_eggs eggs-directory = /srv/slapgrid/slappart2/srv/runner/project/shared-eggs
develop-eggs-directory = /srv/slapgrid/slappart2/srv/runner/project/dev-eggs
abi-tag-eggs = true abi-tag-eggs = true
# Developers need to add explicitely this part in their software profile # Developers need to add explicitely this part in their software profile
# parts = slapos-cookbook # parts = slapos-cookbook
# Note that if you want a develop version of slapos-cookbook from a git # Note that if you want a develop version of slapos-cookbook from a git
# checkout, you must add both slapos-cookbook-develop and slapos-cookbook in parts # checkout, you must add both slapos-cookbook-develop and slapos-cookbook in parts
develop =
${slapos.recipe.build-repository:location}
${slapos.recipe.cmmi-repository:location}
extensions += extensions +=
slapos.rebootstrap slapos.rebootstrap
...@@ -21,7 +28,7 @@ show-picked-versions = true ...@@ -21,7 +28,7 @@ show-picked-versions = true
# To increase the chances of being able to rebuild profiles in the future, # To increase the chances of being able to rebuild profiles in the future,
# by default, fail if eggs are not pinned. # by default, fail if eggs are not pinned.
allow-picked-versions = false allow-picked-versions = true
# Use shacache and lxml # Use shacache and lxml
extends = extends =
...@@ -77,6 +84,7 @@ versions = versions ...@@ -77,6 +84,7 @@ versions = versions
# Define networkcache with shacache.org # Define networkcache with shacache.org
networkcache-section = networkcache networkcache-section = networkcache
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
...@@ -326,3 +334,4 @@ signature-certificate-list = ...@@ -326,3 +334,4 @@ signature-certificate-list =
SyslQFs59yqNxb046uKi7D4JeUd0zdBO3TtceGRK3iyEFNx8GF+em/6pNnC3A/XH SyslQFs59yqNxb046uKi7D4JeUd0zdBO3TtceGRK3iyEFNx8GF+em/6pNnC3A/XH
+L1VRZsQdvh7NHsl/dVvWmmlmOANQ/+JkLbe98c/rCmBDH48Ldc= +L1VRZsQdvh7NHsl/dVvWmmlmOANQ/+JkLbe98c/rCmBDH48Ldc=
-----END CERTIFICATE----- -----END CERTIFICATE-----
\ No newline at end of file
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