diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index 43692d7009a971b001d7cacdbf4ee6df64c083f8..c1f16d820900d3123acde0d55cb04e8cbf3692ec 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -13,10 +13,8 @@ parts += # Local development slapos.cookbook-repository check-recipe - slapos.cookbook-python2.6 z2loganalyser-repository check-z2loganalyser - z2loganalyser-python2.6 # Create instance template template validator @@ -32,7 +30,7 @@ recipe = plone.recipe.command stop-on-error = true location = ${buildout:parts-directory}/${:_buildout_section_name_} repository = https://saneftestbot:kucahS5oav6jahch@git.erp5.org/repos/slapos/sanef.git -branch = CR1094 +branch = deployment_generic_CR1094 # Note: GIT_SSL_NO_VERIFY is used as SlapOS OpenSSL configuration does not # contain master certificates to verify. command = (GIT_SSL_NO_VERIFY=1 ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location}) || (rm -fr ${:location} && exit 1) @@ -44,12 +42,6 @@ stop-on-error = true update-command = ${:command} command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link -[slapos.cookbook-python2.6] -recipe = zc.recipe.egg -eggs = slapos.cookbook -scripts = -python = python2.6 - [z2loganalyser-repository] recipe = plone.recipe.command svn_param =--trust-server-cert --no-auth-cache --non-interactive --quiet -r 45666 @@ -66,12 +58,6 @@ stop-on-error = true update-command = ${:command} command = grep parts ${buildout:develop-eggs-directory}/z2loganalyser.egg-link -[z2loganalyser-python2.6] -recipe = zc.recipe.egg -eggs = z2loganalyser -scripts = -python = python2.6 - [template-mariadb] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-mariadb.cfg diff --git a/stack/erp5.cfg b/stack/erp5.cfg index fb241149d5568cb0bdc0747f35381ff9ccdcc40f..436ca94eb16d4a1da7a781ad9c62963a65e3c26c 100644 --- a/stack/erp5.cfg +++ b/stack/erp5.cfg @@ -386,6 +386,14 @@ eggs = # Dependency for our fork of PortalTransforms StructuredText + slapos.cookbook + z2loganalyser + +bef_dummy = + # Force dependency + ${slapos.cookbook-repository:location} + ${z2loganalyser-repository:location} + # parameterizing the version of the generated python interpreter name by the # python section version causes dependency between this egg section and the # installation of python, which we don't want on an instance