Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
917bb942
Commit
917bb942
authored
Mar 04, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: include nxdbom
parent
8048727f
Pipeline
#34576
failed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
6 deletions
+29
-6
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+10
-1
stack/slapos-dev.cfg
stack/slapos-dev.cfg
+18
-5
stack/slapos.cfg
stack/slapos.cfg
+1
-0
No files found.
software/slapos-sr-testing/software.cfg
View file @
917bb942
...
...
@@ -16,6 +16,7 @@ extends =
../../component/selenium/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos-dev.cfg
../../stack/nxdtest.cfg
../../stack/caucase/buildout.cfg
...
...
@@ -398,11 +399,14 @@ PyPDF2-patch-options = -p1
[eggs/scripts]
recipe = zc.recipe.egg
eggs = ${python-interpreter:eggs}
eggs =
${python-interpreter:eggs}
${nxdbom-dev:egg}
scripts =
slapos
supervisord
caucase
nxdbom
[git-clone-repository]
recipe = slapos.recipe.build:gitclone
...
...
@@ -503,3 +507,8 @@ xmltodict = 0.13.0
# Patched eggs
PyPDF2 = 1.26.0+SlapOSPatched001
[nxdbom-repository]
repository = https://lab.nexedi.com/jerome/nxd-bom.git
branch = feat/cyclonedx-wip
stack/slapos-dev.cfg
View file @
917bb942
...
...
@@ -7,7 +7,7 @@ parts =
slapos-cookbook-develop
slapos.core-dev
erp5.util-dev
slapos-cookbook
nxdbom-dev
[slapos.toolbox-repository]
...
...
@@ -51,8 +51,21 @@ recipe = zc.recipe.egg:develop
egg = slapos.core
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]
slapos.cookbook =
slapos.core =
slapos.toolbox =
erp5-util =
; slapos.cookbook =
; slapos.core =
; slapos.toolbox =
; erp5-util =
nxdbom =
stack/slapos.cfg
View file @
917bb942
...
...
@@ -131,6 +131,7 @@ recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${python-PyYAML:egg}
nxdbom
slapos.core
slapos.libnetworkcache
...
...
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