@@ -15,8 +15,10 @@ class ContivComposer(object):
1515 def add_systest (self , resource , args ):
1616 if self ._is_resource (resource , 'ConfigMap' , 'contiv-config' ,
1717 'kube-system' ):
18- # pop contiv_etcd (etcd or consul endpoints will be passed in during testing)
19- resource ['data' ].pop ('contiv_etcd' )
18+ if args ['start' ] != True :
19+ # pop contiv_etcd unless need start contiv service
20+ # etcd or consul endpoints will be passed in during testing
21+ resource ['data' ].pop ('contiv_etcd' )
2022 if (self ._is_resource (resource , 'DaemonSet' , 'contiv-netplugin' ,
2123 'kube-system' ) or
2224 self ._is_resource (resource , 'ReplicaSet' , 'contiv-netmaster' ,
@@ -25,32 +27,37 @@ class ContivComposer(object):
2527 'containers' ]:
2628 if container ['name' ] in ('contiv-netplugin' ,
2729 'contiv-netmaster' ):
28- # pop etcd endpoints because test case will handle it
29- container ['env' ] = [
30- envar
31- for envar in container ['env' ]
32- if envar [
33- 'name' ] not in 'CONTIV_NETPLUGIN_ETCD_ENDPOINTS' ,
34- 'CONTIV_NETMASTER_ETCD_ENDPOINTS' )
35- ]
36- # make the container idle
37- container ['command' ] = ["tail" , "-f" , "/dev/null" ]
30+ if args ['start' ] != True :
31+ # pop etcd endpoints because test case will handle it
32+ container ['env' ] = [
33+ envar
34+ for envar in container ['env' ]
35+ if envar [
36+ 'name' ] not in
37+ 'CONTIV_NETPLUGIN_ETCD_ENDPOINTS' ,
38+ 'CONTIV_NETMASTER_ETCD_ENDPOINTS' )
39+ ]
40+ # make the container idle
41+ container ['command' ] = ["tail" , "-f" , "/dev/null" ]
3842 # add binary mount points to run tests
3943 container ['volumeMounts' ].append ({
4044 'mountPath' : '/contiv/bin' ,
4145 'name' : 'contiv-bin-dir' ,
42- 'readOnly' : False
46+ 'readOnly' : True
4347 })
48+
4449 container ['volumeMounts' ].append ({
4550 'mountPath' : '/contiv/scripts/' ,
4651 'name' : 'contiv-scripts-dir' ,
47- 'readOnly' : False
48- })
49- container ['volumeMounts' ].append ({
50- 'mountPath' : '/var/log/contiv' ,
51- 'name' : 'contiv-log-dir' ,
52- 'readOnly' : False
52+ 'readOnly' : True
5353 })
54+
55+ if args ['start' ] != True :
56+ container ['volumeMounts' ].append ({
57+ 'mountPath' : '/var/log/contiv' ,
58+ 'name' : 'contiv-log-dir' ,
59+ 'readOnly' : False
60+ })
5461 resource ['spec' ]['template' ]['spec' ]['volumes' ].append ({
5562 'name' : 'contiv-bin-dir' ,
5663 'hostPath' : {'path' : '/opt/gopath/bin' }
@@ -62,12 +69,12 @@ class ContivComposer(object):
6269 '/opt/gopath/src/github.com/contiv/netplugin/scripts/netContain/scripts/'
6370 }
6471 })
65- # systest logging files
66- resource [ 'spec' ][ 'template' ][ 'spec' ][ 'volumes' ]. append ({
67- 'name' : 'contiv-log-dir' ,
68- 'hostPath' : { 'path ''/var/log/ contiv' }
69- })
70-
72+ if args [ 'start' ] != True :
73+ # systest logging files
74+ resource [ 'spec' ][ 'template' ][ 'spec' ][ 'volumes' ]. append ({
75+ 'name ''contiv-log-dir' ,
76+ 'hostPath' : { 'path' : '/var/log/contiv' }
77+ })
7178
7279 def add_prometheus (self , resource , args ):
7380 if (self ._is_resource (resource , 'DaemonSet' , 'contiv-netplugin' ,
@@ -295,10 +302,12 @@ def create_cli_args():
295302 systest_parser = subclis .add_parser (
296303 'add-systest' ,
297304 description = "Add system test required updates" )
305+ systest_parser .add_argument ('--start' ,
306+ action = 'store_true' ,
307+ help = 'start contiv service' )
298308 _add_common_args (systest_parser )
299309 _add_image_args (systest_parser )
300310
301-
302311 # add prometheus
303312 prometheus_parser = subclis .add_parser (
304313 'add-prometheus' ,
0 commit comments