@@ -210,20 +210,22 @@ def command_line(self, track, challenge, car):
210
210
211
211
212
212
class DockerCommand (BaseCommand ):
213
- def __init__ (self , effective_start_date , target_host , root_dir , distribution_version ):
213
+ def __init__ (self , effective_start_date , target_host , root_dir , distribution_version , configuration_name ):
214
214
super ().__init__ (effective_start_date , target_host , root_dir )
215
+ self .configuration_name = configuration_name
215
216
self .pipeline = "docker"
216
217
self .distribution_version = distribution_version .replace ("Docker " , "" )
217
218
218
219
def runnable (self , track , challenge , car ):
219
220
return car not in ["two_nodes" , "verbose_iw" ]
220
221
221
222
def command_line (self , track , challenge , car ):
222
- cmd = "rally --target-host={7} --pipeline={6} --quiet --distribution-version={0} --effective-start-date \" {1}\" " \
223
- "--track={2} --challenge={3} --car={4} --report-format=csv --report-file={5} --cluster-health=yellow " \
223
+ cmd = "rally --configuration-name={8} --target-host={7} --pipeline={6} --quiet --distribution-version={0} " \
224
+ "--effective-start-date \" {1}\" --track={2} --challenge={3} --car={4} --report-format=csv --report-file={5} " \
225
+ "--cluster-health=yellow " \
224
226
"--client-options=\" basic_auth_user:'elastic',basic_auth_password:'changeme',timeout:60000,request_timeout:60000\" " . \
225
227
format (self .distribution_version , self .ts , track , challenge , car , self .report_path (track , challenge , car ), self .pipeline ,
226
- self .target_host )
228
+ self .target_host , self . configuration_name )
227
229
return cmd
228
230
229
231
@@ -579,9 +581,9 @@ def main():
579
581
env_name = sanitize (args .release )
580
582
configure_rally (env_name , args .dry_run )
581
583
if args .release .startswith ("Docker" ):
582
- command = DockerCommand (args .effective_start_date , args .target_host , root_dir , args .release )
584
+ command = DockerCommand (args .effective_start_date , args .target_host , root_dir , args .release , env_name )
583
585
else :
584
- command = ReleaseCommand (args .effective_start_date , args .target_host , root_dir , args .release )
586
+ command = ReleaseCommand (args .effective_start_date , args .target_host , root_dir , args .release , env_name )
585
587
elif adhoc_mode :
586
588
env_name = sanitize (args .release )
587
589
command = AdHocCommand (args .revision , args .effective_start_date , args .target_host , root_dir , env_name , args .override_src_dir )
0 commit comments