WIP: include nxdbom

software/backupserver/buildout.hash.cfg

@@ -37,7 +37,7 @@ filename = template-crontab.in
 md5sum = f1f82101258de19068262b7213fc478b
 
 [status2rss]
-filename = status2rss.py
+filename = status2rss.py.in
 md5sum = 432d22bb0f67df5203bbc5d1134a952b
 
 [template-update-rss-script]

software/mosquitto/software.cfg

@@ -15,8 +15,8 @@ recipe = zc.recipe.egg
 
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance.cfg.in
-rendered = ${buildout:directory}/instance.cfg
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
 context =
   section buildout buildout
   key mosquitto_location mosquitto:location

software/ors-amarisoft/software.cfg

@@ -82,8 +82,17 @@ recipe  = slapos.recipe.build:download
 url     = ${:_profile_base_location_}/config/${:_buildout_section_name_}
 
 [gadget]
-recipe = slapos.recipe.template
-output = ${buildout:directory}/${:_buildout_section_name_}/renderjs.js
+# creates `gadget` folder and downloads renderjs.js
+recipe = slapos.recipe.build
+install =
+  import os
+  if not os.path.exists(location):
+    os.mkdir(location)
+  with open(self.download(options['url'], options['md5sum'])) as src, \
+      open(options['output'], 'w') as dst:
+    dst.write(src.read())
+location = ${buildout:directory}/${:_buildout_section_name_}
+output = ${:location}/renderjs.js
 url = https://lab.nexedi.com/nexedi/renderjs/raw/b715d066bfddc30bedfc8356fb720dcbb391378e/dist/renderjs-0.28.0.js
 md5sum = 7e074a29b07e0045d2ba8a8e63bd499e
 
@@ -103,7 +112,7 @@ inline =
 [copy-gadget-to-software]
 recipe      = slapos.recipe.build:download
 url         = ${:_profile_base_location_}/gadget/${:_buildout_section_name_}
-destination =  ${buildout:directory}/gadget/${:_buildout_section_name_}
+destination =  ${gadget:location}/${:_buildout_section_name_}
 
 [enb.jinja2.cfg]
 <= copy-config-to-instance

software/osie-coupler/software.cfg

@@ -7,13 +7,15 @@ extends =
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
   ../../component/osie-coupler/buildout.cfg
+  ../../component/defaults.cfg
+  buildout.hash.cfg
 
 
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance.cfg.in
+url = ${:_profile_base_location_}/${:filename}
 mode = 0644
-rendered = ${buildout:directory}/instance.cfg
+output = ${buildout:directory}/instance.cfg
 extensions = jinja2.ext.do
 context =
   section buildout buildout

software/slapos-sr-testing/software.cfg

@@ -16,6 +16,7 @@ extends =
   ../../component/selenium/buildout.cfg
 
   ../../stack/slapos.cfg
+  ../../stack/slapos-dev.cfg
   ../../stack/nxdtest.cfg
   ../../stack/caucase/buildout.cfg
 
@@ -412,11 +413,14 @@ interpreter = python_for_test
 
 [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
@@ -428,6 +432,11 @@ forbid-download-cache = true
 repository = https://lab.nexedi.com/nexedi/slapos.git
 branch = master
 
+[nxdbom-repository]
+<= git-clone-repository
+repository = https://lab.nexedi.com/jerome/nxd-bom.git
+branch = feat/cyclonedx-wip
+
 [template]
 recipe = slapos.recipe.template:jinja2
 url = ${:_profile_base_location_}/${:filename}

stack/slapos-dev.cfg

@@ -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

@@ -131,6 +131,7 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   ${python-PyYAML:egg}
+  nxdbom
   slapos.core
   slapos.libnetworkcache
 
@@ -285,6 +286,7 @@ netaddr = 0.7.19
 netifaces = 0.10.7
 notebook = 7.1.2:whl
 notebook-shim = 0.2.4:whl
+nxdbom = 0.0.0.dev2
 openpyxl = 2.5.2
 outcome = 1.2.0
 overrides = 7.7.0