git://git.onelab.eu
/
tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
72262d2
)
install django using pip
author
parmentelat
<thierry.parmentelat@inria.fr>
Tue, 4 Dec 2018 12:49:42 +0000
(13:49 +0100)
committer
parmentelat
<thierry.parmentelat@inria.fr>
Tue, 4 Dec 2018 12:49:42 +0000
(13:49 +0100)
system/TestPlc.py
patch
|
blob
|
history
diff --git
a/system/TestPlc.py
b/system/TestPlc.py
index
6c74294
..
fec7533
100644
(file)
--- a/
system/TestPlc.py
+++ b/
system/TestPlc.py
@@
-153,7
+153,7
@@
class TestPlc:
default_steps = [
'show', SEP,
'plcvm_delete','plcvm_timestamp','plcvm_create', SEP,
default_steps = [
'show', SEP,
'plcvm_delete','plcvm_timestamp','plcvm_create', SEP,
- 'plc_install', 'plc_configure', 'plc_start', SEP,
+ '
django_install', '
plc_install', 'plc_configure', 'plc_start', SEP,
'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP,
'plcapi_urls','speed_up_slices', SEP,
'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP,
'plcapi_urls','speed_up_slices', SEP,
'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
@@
-350,6
+350,9
@@
class TestPlc:
self.run_in_guest("yum-complete-transaction -y")
return self.yum_check_installed(rpms)
self.run_in_guest("yum-complete-transaction -y")
return self.yum_check_installed(rpms)
+ def pip_install(self, package):
+ return self.run_in_guest("pip install {}".format(package))
+
def auth_root(self):
return {'Username' : self.plc_spec['settings']['PLC_ROOT_USER'],
'AuthMethod' : 'password',
def auth_root(self):
return {'Username' : self.plc_spec['settings']['PLC_ROOT_USER'],
'AuthMethod' : 'password',
@@
-711,6
+714,15
@@
class TestPlc:
create_vserver="{build_dir}/{script} {script_options} {vserver_name}".format(**locals())
return self.run_in_host(create_vserver) == 0
create_vserver="{build_dir}/{script} {script_options} {vserver_name}".format(**locals())
return self.run_in_host(create_vserver) == 0
+ ### install django through pip
+ def django_install(self):
+ # plcapi requires Django, that is no longer provided py fedora as an rpm
+ # so we use pip instead
+ """
+ pip install Django
+ """
+ return self.pip_install('Django')
+
### install_rpm
def plc_install(self):
"""
### install_rpm
def plc_install(self):
"""