@@ -291,11 +291,11 @@ def _prepare_testing(o):
291
291
subprocess .call (["docker" , "build" , "-t" , "odoo-%s-debian-nightly-tests" % version , "." ],
292
292
cwd = os .path .join (o .build_dir , "docker_debian" ))
293
293
if not o .no_rpm :
294
- subprocess .call (["mkdir" , "docker_centos " ], cwd = o .build_dir )
295
- subprocess .call (["cp" , "package.dfcentos " , os .path .join (o .build_dir , "docker_centos " , "Dockerfile" )],
294
+ subprocess .call (["mkdir" , "docker_fedora " ], cwd = o .build_dir )
295
+ subprocess .call (["cp" , "package.dffedora " , os .path .join (o .build_dir , "docker_fedora " , "Dockerfile" )],
296
296
cwd = os .path .join (o .odoo_dir , "setup" ))
297
- subprocess .call (["docker" , "build" , "-t" , "odoo-%s-centos -nightly-tests" % version , "." ],
298
- cwd = os .path .join (o .build_dir , "docker_centos " ))
297
+ subprocess .call (["docker" , "build" , "-t" , "odoo-%s-fedora -nightly-tests" % version , "." ],
298
+ cwd = os .path .join (o .build_dir , "docker_fedora " ))
299
299
300
300
def test_tgz (o ):
301
301
with docker ('odoo-%s-src-nightly-tests' % version , o .build_dir , o .pub ) as wheezy :
@@ -321,16 +321,16 @@ def test_deb(o):
321
321
wheezy .system ('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany &"' )
322
322
323
323
def test_rpm (o ):
324
- with docker ('odoo-%s-centos -nightly-tests' % version , o .build_dir , o .pub ) as centos7 :
325
- centos7 .release = '*.noarch.rpm'
324
+ with docker ('odoo-%s-fedora -nightly-tests' % version , o .build_dir , o .pub ) as fedora24 :
325
+ fedora24 .release = '*.noarch.rpm'
326
326
# Start postgresql
327
- centos7 .system ('su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"' )
328
- centos7 .system ('sleep 5' )
329
- centos7 .system ('su postgres -c "createdb mycompany"' )
327
+ fedora24 .system ('su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"' )
328
+ fedora24 .system ('sleep 5' )
329
+ fedora24 .system ('su postgres -c "createdb mycompany"' )
330
330
# Odoo install
331
- centos7 .system ('yum install -d 0 -e 0 /opt/release/%s -y' % centos7 .release )
332
- centos7 .system ('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"' )
333
- centos7 .system ('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany &"' )
331
+ fedora24 .system ('dnf install -d 0 -e 0 /opt/release/%s -y' % fedora24 .release )
332
+ fedora24 .system ('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"' )
333
+ fedora24 .system ('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany &"' )
334
334
335
335
def test_exe (o ):
336
336
KVMWinTestExe (o , o .vm_winxp_image , o .vm_winxp_ssh_key , o .vm_winxp_login ).start ()
0 commit comments