diff options
Diffstat (limited to 'setup/package.py')
| -rwxr-xr-x | setup/package.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setup/package.py b/setup/package.py index c9f60ed81f1..edfdcab8b94 100755 --- a/setup/package.py +++ b/setup/package.py @@ -304,17 +304,17 @@ def _prepare_testing(o): subprocess.call(["mkdir", "docker_debian"], cwd=o.build_dir) subprocess.call(["cp", "package.dfdebian", os.path.join(o.build_dir, "docker_debian", "Dockerfile")], cwd=os.path.join(o.odoo_dir, "setup")) - subprocess.call(["docker", "build", "-t", "openerp-debian-nightly-tests", "."], + subprocess.call(["docker", "build", "-t", "openerp-%s-debian-nightly-tests" % version, "."], cwd=os.path.join(o.build_dir, "docker_debian")) if not o.no_rpm: subprocess.call(["mkdir", "docker_centos"], cwd=o.build_dir) subprocess.call(["cp", "package.dfcentos", os.path.join(o.build_dir, "docker_centos", "Dockerfile")], cwd=os.path.join(o.odoo_dir, "setup")) - subprocess.call(["docker", "build", "-t", "openerp-centos-nightly-tests", "."], + subprocess.call(["docker", "build", "-t", "openerp-%s-centos-nightly-tests" % version, "."], cwd=os.path.join(o.build_dir, "docker_centos")) def test_tgz(o): - with docker('openerp-debian-nightly-tests', o.build_dir, o.pub) as wheezy: + with docker('openerp-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy: wheezy.release = 'openerp.tar.gz' wheezy.system("service postgresql start") wheezy.system('pip install /opt/release/%s' % wheezy.release) @@ -327,7 +327,7 @@ def test_tgz(o): wheezy.system('su openerp -s /bin/bash -c "openerp-server --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany &"') def test_deb(o): - with docker('openerp-debian-nightly-tests', o.build_dir, o.pub) as wheezy: + with docker('openerp-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy: wheezy.release = '*.deb' wheezy.system("service postgresql start") wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') @@ -337,7 +337,7 @@ def test_deb(o): wheezy.system('su openerp -s /bin/bash -c "openerp-server -c /etc/openerp/openerp-server.conf -d mycompany &"') def test_rpm(o): - with docker('openerp-centos-nightly-tests', o.build_dir, o.pub) as centos6: + with docker('openerp-%s-centos-nightly-tests' % version, o.build_dir, o.pub) as centos6: centos6.release = 'openerp.noarch.rpm' # Start postgresql centos6.system('su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"') |