Commit a7a36453 authored by Julien Muchembled's avatar Julien Muchembled

Clean up some zc.recipe.egg sections installing the same scripts/interpreter

parent ffbb80d4
......@@ -70,7 +70,6 @@ scripts =
[jupyter-notebook-initialized-scripts]
recipe = zc.recipe.egg:scripts
eggs = ${jupyter:eggs}
interpreter = pythonjupyter
environment = jupyter-env
scripts =
......
......@@ -17,7 +17,6 @@ extends =
parts =
extra-eggs
monitor-extra-eggs
rdiff-backup
dcron
logrotate
......@@ -30,11 +29,6 @@ parts =
template-crontab-line
slapos-cookbook
[monitor-extra-eggs]
recipe = zc.recipe.egg
eggs =
${monitor-eggs:eggs}
[extra-eggs]
recipe = zc.recipe.egg
interpreter = pythonforrssgen
......
......@@ -8,7 +8,6 @@ extends =
../../component/nodejs/buildout.cfg
parts =
monitor-eggs
slapos-cookbook
nodejs
template
......
......@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
md5sum = c9d4356b5148ed8ff8c4f3da63c137ce
md5sum = cad7d490b84a484b089e34b27a5675ff
[template-kvm]
filename = instance-kvm.cfg.jinja2
......
......@@ -87,7 +87,7 @@ extra-context =
raw novnc_location ${noVNC:location}
raw netcat_bin ${netcat:location}/bin/netcat
raw python_executable ${buildout:executable}
raw python_eggs_executable ${buildout:bin-directory}/${eggs:interpreter}
raw python_eggs_executable ${buildout:bin-directory}/${extra-eggs:interpreter}
raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
......
......@@ -19,7 +19,6 @@ extends =
# to avoid versioning issues
common-parts =
template
eggs
# XXX: we have to manually add this for resilience
rdiff-backup
......@@ -41,22 +40,12 @@ parts = ${:common-parts}
#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
[eggs]
recipe = zc.recipe.egg
interpreter = python.eggs
eggs =
[extra-eggs]
eggs +=
${python-cffi:egg}
${python-cryptography:egg}
${lxml-python:egg}
websockify
slapos.cookbook
slapos.toolbox
erp5.util
cns.recipe.symlink
collective.recipe.template
plone.recipe.command
${pycurl:egg}
collective.recipe.shelloutput
[http-proxy]
# https://github.com/nodejitsu/node-http-proxy
......
......@@ -84,11 +84,13 @@ scripts =
surykatka
[monitor-eggs]
recipe = zc.recipe.egg
eggs +=
slapos.cookbook
slapos.recipe.cmmi
hexagonit.recipe.download
plone.recipe.command
scripts =
[versions]
slapos.recipe.template = 4.4
......
......@@ -25,7 +25,6 @@ parts =
# before any other section that would depend on it
neoppod-develop
neoppod
slapos-deps-eggs
slapos-cookbook
[neoppod-repository]
......@@ -72,18 +71,6 @@ egg = ${:_buildout_section_name_}
setup-eggs = ${python-cffi:egg}
###
[slapos-deps-eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${pycurl:egg}
${python-PyYAML:egg}
${python-cryptography:egg}
${python-cliff:egg}
slapos.toolbox
scripts =
slapos-kill
[download-base-neo]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
......
......@@ -39,7 +39,6 @@ parts =
neotest-runTestSuite
# for instance
slapos-deps-eggs
slapos-cookbook
instance.cfg
......
......@@ -8,7 +8,6 @@ extends =
parts =
template
slapos-cookbook
monitor-eggs
eggs
[eggs]
......
......@@ -9,7 +9,7 @@ python = python3
common-parts -=
rdiff-backup
[eggs]
[extra-eggs]
eggs -=
# futures is a backport of Py3's concurrent.futures module
futures
......@@ -37,8 +37,8 @@ shared-part-list =
# to avoid versioning issues
common-parts =
slapos-cookbook
template
eggs
instance-runner-import
instance-runner-export
template-slapos-cfg
......@@ -141,27 +141,15 @@ filename = slapos-slapuser-script.in
< = template-base
output = ${buildout:directory}/buildout-shared-part-list
[eggs]
recipe = zc.recipe.egg
eggs =
${pycurl:egg}
collective.recipe.template
cns.recipe.symlink
[extra-eggs]
eggs +=
erp5.util
lock-file
plone.recipe.command
slapos.recipe.build
slapos.toolbox[flask_auth]
gunicorn
# for gunicorn[gthread]
futures
${slapos-cookbook:eggs}
slapos.core # listed explicitly for scripts generation
[extra-eggs]
recipe = zc.recipe.egg
interpreter = pythonwitheggs
eggs +=
supervisor
[versions]
......
......@@ -26,6 +26,7 @@ eggs =
${slapos-cookbook:eggs}
plone.recipe.command
slapos.recipe.template
scripts =
[caucase-jinja2-library]
recipe = slapos.recipe.build:download
......
......@@ -86,6 +86,7 @@ parts +=
# some additional utils
zodbanalyze
zodbpack
# Create instance template
template
......@@ -518,7 +519,6 @@ entry-points =
scripts =
apachedex
performance_tester_erp5
repozo
runwsgi
runzope
runzeo
......@@ -556,22 +556,21 @@ scripts = zodbanalyze
recipe = zc.recipe.egg:develop
setup = ${erp5:location}
[slapos-deps-eggs]
[zodbpack]
recipe = zc.recipe.egg
eggs +=
eggs =
${lxml-python:egg}
${pycurl:egg}
${python-PyYAML:egg}
${python-cryptography:egg}
${python-cliff:egg}
slapos.toolbox[zodbpack]
scripts +=
is-local-tcp-port-opened
is-process-older-than-dependency-set
check-slow-queries-digest-result
check-apachedex-result
check-computer-memory
runApacheDex
scripts =
zodbpack
[versions]
# See ../../software/neoppod/software-common.cfg for versions common with NEO:
# neoppod, mysqlclient, slapos.recipe.template & [slapos-deps-eggs]
# neoppod, mysqlclient, slapos.recipe.template
# patched eggs
Acquisition = 2.13.12+SlapOSPatched001
......
......@@ -13,7 +13,6 @@ extends =
parts =
slapos-cookbook
monitor-eggs
extra-eggs
monitor2-template
......@@ -31,7 +30,7 @@ destination = ${buildout:parts-directory}/monitor-scripts
on-update = true
[monitor-eggs]
recipe = zc.recipe.egg
# XXX: merge with extra-eggs?
eggs =
${lxml-python:egg}
${pycurl:egg}
......@@ -42,9 +41,6 @@ eggs =
slapos.toolbox
slapos.core
# Do no generate any scripts here as all of them are generated by extraeggs
scripts =
[extra-eggs]
recipe = zc.recipe.egg
interpreter = pythonwitheggs
......@@ -105,8 +101,6 @@ context =
raw template_wrapper ${monitor-template-wrapper:location}/${monitor-template-wrapper:filename}
raw check_disk_space ${buildout:directory}/bin/check-free-disk
raw bin_directory ${buildout:directory}/bin
depends =
${monitor-eggs:eggs}
[versions]
cns.recipe.symlink = 0.2.3
......
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