diff --git a/CHANGES.rst b/CHANGES.rst index 2c2bc58b4d396f59b69414c239db18ab37ba150e..37b0e734efc70e2e88b7617e1a3a5b7adcef4e36 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,12 @@ Changes ======= +1.0.124 (2020-01-30) +-------------------- + +- cookbook:erp5testnode: new shared_part_list option + + 1.0.123 (2019-10-03) -------------------- diff --git a/setup.py b/setup.py index b3d036932625dd64b705146a52e67b6001e8a320..437037f585e723fa7ffc737a952515bed8377847 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ from setuptools import setup, find_packages import glob import os -version = '1.0.123' +version = '1.0.124' name = 'slapos.cookbook' long_description = open("README.rst").read() + "\n" + \ open("CHANGES.rst").read() + "\n" diff --git a/slapos/recipe/erp5testnode/template/erp5testnode.cfg.in b/slapos/recipe/erp5testnode/template/erp5testnode.cfg.in index 83da16ea76a391aa46c9fa2be3de429abeff6356..1413e5760c65faff915596c2e9e5e2db2215c980 100644 --- a/slapos/recipe/erp5testnode/template/erp5testnode.cfg.in +++ b/slapos/recipe/erp5testnode/template/erp5testnode.cfg.in @@ -2,6 +2,7 @@ slapos_directory = %(slapos_directory)s working_directory = %(working_directory)s test_suite_directory = %(test_suite_directory)s +shared_part_list = %(shared_part_list)s software_directory = %(software_directory)s log_directory = %(log_directory)s run_directory = %(run_directory)s diff --git a/software/erp5testnode/buildout.hash.cfg b/software/erp5testnode/buildout.hash.cfg index 515970bb287cd7e3aecbfbab45c5fb2fd597cdb2..940765f95c6499dc9969f1a9c681e1b1aa06fb76 100644 --- a/software/erp5testnode/buildout.hash.cfg +++ b/software/erp5testnode/buildout.hash.cfg @@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e [template-default] filename = instance-default.cfg -md5sum = a76803eedf0c66fe7649b62efc86c8fe +md5sum = 3c2420de64f079b3b3231dfbff1633b5 diff --git a/software/erp5testnode/instance-default.cfg b/software/erp5testnode/instance-default.cfg index d29bc05a3d707874e8fdb96c5746da962d66abfe..5f1d8ac951d5a2ff0c6caeaa6e48bd4891920117 100644 --- a/software/erp5testnode/instance-default.cfg +++ b/software/erp5testnode/instance-default.cfg @@ -33,6 +33,7 @@ recipe = slapos.cookbook:erp5testnode slapos-directory = $${directory:slapos} working-directory = $${directory:testnode} test-suite-directory = $${directory:test-suite} +shared-part-list = $${directory:shared} proxy-host = $${slap-network-information:local-ipv4} proxy-port = 5000 log-directory = $${directory:log} @@ -188,6 +189,7 @@ run = $${rootdirectory:var}/run recipe = slapos.cookbook:mkdirectory slapos = $${rootdirectory:srv}/slapos testnode = $${rootdirectory:srv}/testnode +shared = $${rootdirectory:srv}/shared test-suite = $${rootdirectory:srv}/test_suite log = $${basedirectory:log}/testnode run = $${basedirectory:run}/testnode diff --git a/stack/slapos.cfg b/stack/slapos.cfg index 431004de7036b240b8f388ec4ab3fa00b1758d09..8e273c635a358cfb2b9beb142cddaffca52cc134 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -137,7 +137,7 @@ pyparsing = 2.2.0 pytz = 2016.10 requests = 2.13.0 six = 1.12.0 -slapos.cookbook = 1.0.123 +slapos.cookbook = 1.0.124 slapos.core = 1.5.7 slapos.extension.strip = 0.4 slapos.extension.shared = 1.0 @@ -196,7 +196,7 @@ enum34 = 1.1.6 # Required by: # slapos.toolbox==0.94 -erp5.util = 0.4.65 +erp5.util = 0.4.66 # Required by: # slapos.toolbox==0.94