diff --git a/software/sanef/instance.cfg b/software/sanef/instance.cfg index 414e135b94cd55af85922699b3fea0f8d424a6b9..afa55bc5a4b9b71011d5504e6bf94271d44d3f2b 100644 --- a/software/sanef/instance.cfg +++ b/software/sanef/instance.cfg @@ -72,7 +72,7 @@ link_binary_list = bt5_repo_list = ${erp5:location}/product/ERP5/bootstrap bt5bootstrap ${erp5:location}/bt5 bt5erp5 - ${bt5-bef:location} bt5bef + ${sanef.repository:location}/bt5 bt5bef # XXX: products won't be needed as soon as all ERP5 (and products-deps) # products will be eggified so then it will be possible to use them thanks to diff --git a/software/sanef/software.cfg b/software/sanef/software.cfg index 38da2b4b5c40af93025a33bbd560a5e5c4bb5b8b..13ea8a962e50a01a7ee3ca1a811cc16ba0b1ca18 100644 --- a/software/sanef/software.cfg +++ b/software/sanef/software.cfg @@ -12,9 +12,7 @@ extends = parts += sanef.repository mysql-tritonn-5.0 - products-bef products-upgrade - bt5-bef bt5-repository checkrecipe checkz2loganalyser @@ -76,36 +74,13 @@ command = <= erp5 repository = https://saneftestbot:kucahS5oav6jahch@git.erp5.org/repos/sanef.git -[bef-svn-template] -# Recipe infrae.subversion is using svn command under the hood, but there is -# no way to pass --trust-server-cert --non-interactive, so in 2.12 falvour -# it is better to evaluate usage of provided subversion command -recipe = plone.recipe.command -svn_param =--trust-server-cert --no-auth-cache --non-interactive --quiet --username saneftestbot --password kucahS5oav6jahch -r 5114 -svn = ${subversion:location}/bin/svn -location = ${buildout:parts-directory}/${:_buildout_section_name_} -stop-on-error = true -update-command = ${:command} - [bt5-repository] recipe = plone.recipe.command stop-on-error = true command = - ${buildout:executable} ${erp5:location}/product/ERP5/bin/genbt5list ${erp5:location}/product/ERP5/bootstrap ${erp5:location}/bt5 ${bt5-bef:location} + ${buildout:executable} ${erp5:location}/product/ERP5/bin/genbt5list ${erp5:location}/product/ERP5/bootstrap ${erp5:location}/bt5 ${sanef.repository:location}/bt5 update-command = ${:command} - -[bt5-bef] -<= bef-svn-template -command = - ${:svn} checkout ${:svn_param} https://svn.erp5.org/repos/sanef/trunk/bt5 ${:location} || exit 1 - -[products-bef] -<= bef-svn-template -product_list = SANEF -command = - for product in SANEF ; do ${:svn} checkout ${:svn_param} https://svn.erp5.org/repos/sanef/trunk/products/$product ${:location}/$product || exit 1 ; done - [products-upgrade] # Recipe infrae.subversion is using svn command under the hood, but there is # no way to pass --trust-server-cert --non-interactive, so in 2.12 falvour @@ -127,14 +102,14 @@ update-command = ${:command} command = mkdir -p ${:location}/Products && for product in ${erp5:location}/product/* ; do ln -fs $product ${:location}/Products ; done && - ln -fs ${products-bef:location}/SANEF ${:location}/Products && + for product in ${sanef.repository}/product/* ; do ln -fs $product ${:location}/Products ; done && echo "__import__('pkg_resources').declare_namespace(__name__)" > "${:location}/Products/__init__.py" [products] # XXX: Lack of eggification workaround # list of products, possible to extend, it is passed in reversed way # to allow overriding during extending profile -list = ${products-deps:location} ${products-upgrade:location} ${products-bef:location} +list = ${products-deps:location} ${products-upgrade:location} [bef_erp5-recipe] recipe = plone.recipe.command