Commit 6b79adfd authored by Jérome Perrin's avatar Jérome Perrin

software/slapos-sr-testing: WIP run nxdbom 🙅

This needs lots of cleanups
parent ed0e2eda
...@@ -16,6 +16,7 @@ extends = ...@@ -16,6 +16,7 @@ extends =
../../component/selenium/buildout.cfg ../../component/selenium/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/slapos-dev.cfg
../../stack/nxdtest.cfg ../../stack/nxdtest.cfg
../../stack/caucase/buildout.cfg ../../stack/caucase/buildout.cfg
...@@ -399,11 +400,14 @@ PyPDF2-patch-options = -p1 ...@@ -399,11 +400,14 @@ PyPDF2-patch-options = -p1
[eggs/scripts] [eggs/scripts]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = ${python-interpreter:eggs} eggs =
${python-interpreter:eggs}
${nxdbom-dev:egg}
scripts = scripts =
slapos slapos
supervisord supervisord
caucase caucase
nxdbom
[git-clone-repository] [git-clone-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
...@@ -415,6 +419,11 @@ forbid-download-cache = true ...@@ -415,6 +419,11 @@ forbid-download-cache = true
repository = https://lab.nexedi.com/nexedi/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
[nxdbom-repository]
<= git-clone-repository
repository = https://lab.nexedi.com/jerome/nxd-bom.git
branch = feat/cyclonedx-wip
[template] [template]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
slapos-cookbook-develop slapos-cookbook-develop
slapos.core-dev slapos.core-dev
erp5.util-dev erp5.util-dev
slapos-cookbook nxdbom-dev
[slapos.toolbox-repository] [slapos.toolbox-repository]
...@@ -51,8 +51,21 @@ recipe = zc.recipe.egg:develop ...@@ -51,8 +51,21 @@ recipe = zc.recipe.egg:develop
egg = slapos.core egg = slapos.core
setup = ${slapos.core-repository:location} setup = ${slapos.core-repository:location}
[nxdbom-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/nxd-bom.git
branch = master
git-executable = ${git:location}/bin/git
develop = true
[nxdbom-dev]
recipe = zc.recipe.egg:develop
egg = nxdbom
setup = ${nxdbom-repository:location}
[versions] [versions]
slapos.cookbook = ; slapos.cookbook =
slapos.core = ; slapos.core =
slapos.toolbox = ; slapos.toolbox =
erp5-util = ; erp5-util =
nxdbom =
...@@ -39,6 +39,7 @@ exec-sitecustomize = false ...@@ -39,6 +39,7 @@ exec-sitecustomize = false
find-links += find-links +=
http://www.nexedi.org/static/packages/source/ http://www.nexedi.org/static/packages/source/
http://www.nexedi.org/static/packages/source/slapos.buildout/ http://www.nexedi.org/static/packages/source/slapos.buildout/
https://lab.nexedi.com/jerome/slapos/raw/zope4py3/nxdbom-0.0.0.dev2.tar.gz
# Use only quite well working sites. # Use only quite well working sites.
allow-hosts += allow-hosts +=
...@@ -58,6 +59,7 @@ allow-hosts += ...@@ -58,6 +59,7 @@ allow-hosts +=
sourceforge.net sourceforge.net
www.dabeaz.com www.dabeaz.com
www.owlfish.com www.owlfish.com
lab.nexedi.com
# Use an https index # Use an https index
index = https://pypi.org/simple/ index = https://pypi.org/simple/
...@@ -131,6 +133,7 @@ recipe = zc.recipe.egg ...@@ -131,6 +133,7 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-PyYAML:egg} ${python-PyYAML:egg}
nxdbom
slapos.core slapos.core
slapos.libnetworkcache slapos.libnetworkcache
...@@ -273,6 +276,7 @@ netaddr = 0.7.19 ...@@ -273,6 +276,7 @@ netaddr = 0.7.19
netifaces = 0.10.7 netifaces = 0.10.7
notebook = 7.1.2:whl notebook = 7.1.2:whl
notebook-shim = 0.2.4:whl notebook-shim = 0.2.4:whl
nxdbom = 0.0.0.dev2
openpyxl = 2.5.2 openpyxl = 2.5.2
outcome = 1.2.0 outcome = 1.2.0
overrides = 7.7.0 overrides = 7.7.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