slaprunner: Even on development.cfg we would like the eggs pin

  As this is used by the tests.

software/slaprunner/common.cfg

-[buildout]
-extends =
-  buildout.hash.cfg
-  ../../component/bash/buildout.cfg
-  ../../component/busybox/buildout.cfg
-  ../../component/curl/buildout.cfg
-  ../../component/dash/buildout.cfg
-  ../../component/dcron/buildout.cfg
-  ../../component/git/buildout.cfg
-  ../../component/tig/buildout.cfg
-  ../../component/logrotate/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-  ../../component/nano/buildout.cfg
-  ../../component/nginx/buildout.cfg
-  ../../component/openssh/buildout.cfg
-  ../../component/mosh/buildout.cfg
-  ../../component/rsync/buildout.cfg
-  ../../component/pycurl/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
-  ../../component/screen/buildout.cfg
-  ../../component/shellinabox/buildout.cfg
-  ../../component/vim/buildout.cfg
-  ../../component/zip/buildout.cfg
-  ../../stack/slapos.cfg
-  ../../stack/flask.cfg
-  ../../stack/resilient/buildout.cfg
-  ../../stack/monitor/buildout.cfg
-
-# stacks are listed from most generic to most specific,
-# to avoid versioning issues
-
-common-parts =
-  template
-  eggs
-  instance-runner-import
-  instance-runner-export
-  template-slapos-cfg
-  template-slapuser-script
-# XXX: we have to manually add this for resilience
-  rdiff-backup
-  pbs-recipe-egg
-
-parts =
-  ${:common-parts}
-
-# Use shellinabox from github with AF_UNIX support
-[shellinabox]
-<= shellinabox-github
-
-[template-base]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-mode = 0644
-
-[download-base]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-mode = 0644
-
-[download-only-base]
-< = download-base
-ignore-existing = true
-download-only = true
-
-[template-download-base]
-# Downloads from template directory into current directory
-< = download-only-base
-url = ${:_profile_base_location_}/template/${:filename}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-
-[template]
-< = template-base
-output = ${buildout:directory}/template.cfg
-
-[template-runner]
-< = template-base
-output = ${buildout:directory}/template-runner.cfg.in
-
-[template-runner-import-script]
-< = template-download-base
-filename = runner-import.sh.jinja2
-
-[template-runner-export-script]
-< = template-download-base
-filename = runner-export.sh.jinja2
-
-[instance-runner-import]
-< = download-base
-recipe = slapos.recipe.build:download
-
-[instance-runner-export]
-< = download-base
-recipe = slapos.recipe.build:download
-
-[template-resilient]
-< = download-base
-recipe = slapos.recipe.build:download
-
-[template_nginx_conf]
-< = download-only-base
-
-[template_httpd_conf]
-< = download-only-base
-
-[template_launcher]
-< = download-base
-recipe = slapos.recipe.build:download
-
-[template-slapos-cfg]
-< = template-download-base
-filename = slapos.cfg.in
-
-[template-parameters]
-< = download-only-base
-
-[template-bash-profile]
-< = template-download-base
-filename = bash_profile.in
-
-[template-supervisord]
-< = template-download-base
-filename = supervisord.conf.in
-
-[template-listener-slapgrid]
-< = template-download-base
-filename = listener_slapgrid.py.in
-
-[monitor-check-webrunner-internal-instance]
-< = template-download-base
-destination = ${:location}/${:filename}
-filename = monitor-check-webrunner-internal-instances.py
-
-[template-resilient-software-release-information]
-< = template-download-base
-filename = resilient_software_release_information.py.in
-
-[template-slapuser-script]
-< = template-download-base
-filename = slapos-slapuser-script.in
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${pycurl:egg}
-  collective.recipe.template
-  cns.recipe.symlink
-  erp5.util
-  lock-file
-  plone.recipe.command
-  slapos.recipe.build
-  slapos.toolbox[flask_auth]
-  gunicorn==19.7.1
-  futures
-  ${slapos-cookbook:eggs}
-  slapos.core # listed explicitly for scripts generation
-
-[extra-eggs]
-recipe = zc.recipe.egg
-interpreter = pythonwitheggs
-eggs +=
-  supervisor
-

software/slaprunner/development.cfg

@@ -4,7 +4,7 @@
 # allowing to play with bleeding edge environment.
 
 [buildout]
-extends = common.cfg
+extends = software.cfg
   ../../stack/slapos-dev.cfg
 
 parts +=
@@ -15,4 +15,3 @@ parts +=
 slapos.cookbook =
 slapos.core =
 slapos.toolbox =
-lockfile =

software/slaprunner/software.cfg

-# Production profile of slaprunner.
-# Exactly the same as common.cfg, but:
-# 1/ Use a defined set of Python eggs instead of using the latest available
-#    ones from Pypi, to ensure stability;
-
 [buildout]
-extends = common.cfg
+extends =
+  buildout.hash.cfg
+  ../../component/bash/buildout.cfg
+  ../../component/busybox/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/tig/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/nano/buildout.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/openssh/buildout.cfg
+  ../../component/mosh/buildout.cfg
+  ../../component/rsync/buildout.cfg
+  ../../component/pycurl/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/screen/buildout.cfg
+  ../../component/shellinabox/buildout.cfg
+  ../../component/vim/buildout.cfg
+  ../../component/zip/buildout.cfg
+  ../../stack/slapos.cfg
+  ../../stack/flask.cfg
+  ../../stack/resilient/buildout.cfg
+  ../../stack/monitor/buildout.cfg
+
+# stacks are listed from most generic to most specific,
+# to avoid versioning issues
+
+common-parts =
+  template
+  eggs
+  instance-runner-import
+  instance-runner-export
+  template-slapos-cfg
+  template-slapuser-script
+# XXX: we have to manually add this for resilience
+  rdiff-backup
+  pbs-recipe-egg
+
+parts =
+  ${:common-parts}
+
+# Use shellinabox from github with AF_UNIX support
+[shellinabox]
+<= shellinabox-github
+
+[template-base]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+mode = 0644
+
+[download-base]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+mode = 0644
+
+[download-only-base]
+< = download-base
+ignore-existing = true
+download-only = true
+
+[template-download-base]
+# Downloads from template directory into current directory
+< = download-only-base
+url = ${:_profile_base_location_}/template/${:filename}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template]
+< = template-base
+output = ${buildout:directory}/template.cfg
+
+[template-runner]
+< = template-base
+output = ${buildout:directory}/template-runner.cfg.in
+
+[template-runner-import-script]
+< = template-download-base
+filename = runner-import.sh.jinja2
+
+[template-runner-export-script]
+< = template-download-base
+filename = runner-export.sh.jinja2
+
+[instance-runner-import]
+< = download-base
+recipe = slapos.recipe.build:download
+
+[instance-runner-export]
+< = download-base
+recipe = slapos.recipe.build:download
+
+[template-resilient]
+< = download-base
+recipe = slapos.recipe.build:download
+
+[template_nginx_conf]
+< = download-only-base
+
+[template_httpd_conf]
+< = download-only-base
+
+[template_launcher]
+< = download-base
+recipe = slapos.recipe.build:download
+
+[template-slapos-cfg]
+< = template-download-base
+filename = slapos.cfg.in
+
+[template-parameters]
+< = download-only-base
+
+[template-bash-profile]
+< = template-download-base
+filename = bash_profile.in
+
+[template-supervisord]
+< = template-download-base
+filename = supervisord.conf.in
+
+[template-listener-slapgrid]
+< = template-download-base
+filename = listener_slapgrid.py.in
+
+[monitor-check-webrunner-internal-instance]
+< = template-download-base
+destination = ${:location}/${:filename}
+filename = monitor-check-webrunner-internal-instances.py
+
+[template-resilient-software-release-information]
+< = template-download-base
+filename = resilient_software_release_information.py.in
+
+[template-slapuser-script]
+< = template-download-base
+filename = slapos-slapuser-script.in
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${pycurl:egg}
+  collective.recipe.template
+  cns.recipe.symlink
+  erp5.util
+  lock-file
+  plone.recipe.command
+  slapos.recipe.build
+  slapos.toolbox[flask_auth]
+  gunicorn==19.7.1
+  futures
+  ${slapos-cookbook:eggs}
+  slapos.core # listed explicitly for scripts generation
+
+[extra-eggs]
+recipe = zc.recipe.egg
+interpreter = pythonwitheggs
+eggs +=
+  supervisor
 
 [versions]
 Flask-Auth = 0.85