Release benchmarks: fix x-pack-components to be a string

Specify x-pack-components as a string, rather than a stringified array
when performing release benchmarks with RELEASE_X_PACK_COMPONENTS
specified.

Relates elastic#104

Author: dliappis

night_rally/night_rally.py

@@ -497,7 +497,7 @@ def user_tags(self, x_pack, track_license):
         if x_pack:
             user_tags += ["x-pack:true"]
         if self.release_params and "x-pack-components" in self.release_params:
-            user_tags += ["x-pack-components:{}".format(self.release_params["x-pack-components"])]
+            user_tags += ["x-pack-components:{}".format(",".join(self.release_params["x-pack-components"]))]
         return user_tags
 
 

tests/night_rally_test.py

@@ -191,7 +191,7 @@ def test_parses_release_with_security_and_monitoring_6_5_1(self):
         self.assertEqual("6.5.1", common_cli_params.version)
         self.assertEqual({
             "license": "trial",
-            "x-pack-components": ["security", "monitoring"]},
+            "x-pack-components": ["security","monitoring"]},
             common_cli_params.release_params
         )
         self.assertEqual(os.path.basename(race_configs_id), common_cli_params.race_configs_id)
@@ -942,7 +942,7 @@ def test_run_release_benchmark_with_plugins(self, mocked_wait_until_port_is_free
                 "--client-options=\"timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:'rally',"
                 "basic_auth_password:'rally-password'\" "
                 "--user-tag=\"name:geonames-defaults,setup:bare-trial-security,race-configs-id:{},license:trial,x-pack:true,"
-                "x-pack-components:[\'security\', \'monitoring\']\" "
+                "x-pack-components:security,monitoring\" "
                 "--runtime-jdk=\"8\" --track-params=\"bulk_size:3000\" "
                 "--elasticsearch-plugins=\"x-pack:security+monitoring\" "
                 "--distribution-version=\"5.4.0\" --pipeline=\"from-distribution\"".format(race_configs_id),
@@ -953,7 +953,7 @@ def test_run_release_benchmark_with_plugins(self, mocked_wait_until_port_is_free
                 "--client-options=\"timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:'rally',"
                 "basic_auth_password:'rally-password'\" "
                 "--user-tag=\"name:geonames-4g,setup:bare-trial-security,race-configs-id:{},license:trial,x-pack:true,"
-                "x-pack-components:[\'security\', \'monitoring\']\" "
+                "x-pack-components:security,monitoring\" "
                 "--runtime-jdk=\"8\" --track-params=\"bulk_size:2000\" "
                 "--elasticsearch-plugins=\"x-pack:security+monitoring\" --distribution-version=\"5.4.0\" "
                 "--pipeline=\"from-distribution\"".format(race_configs_id),
@@ -963,7 +963,7 @@ def test_run_release_benchmark_with_plugins(self, mocked_wait_until_port_is_free
                 "--car=\"4gheap\" --client-options=\"timeout:240,use_ssl:true,verify_certs:false,"
                 "basic_auth_user:'rally',basic_auth_password:'rally-password'\" "
                 "--user-tag=\"name:geonames-4g-with-ml,setup:bare-trial-security,race-configs-id:{},license:trial,x-pack:true"
-                ",x-pack-components:[\'security\', \'monitoring\']\" "
+                ",x-pack-components:security,monitoring\" "
                 "--runtime-jdk=\"8\""
                 " --elasticsearch-plugins=\"x-pack:ml+security+monitoring\" "
                 "--distribution-version=\"5.4.0\" --pipeline=\"from-distribution\"".format(race_configs_id),
@@ -1034,7 +1034,7 @@ def test_run_trial_release_benchmarks_with_x_pack_module(self, mocked_wait_until
              '--client-options="timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:\'rally\''
              ',basic_auth_password:\'rally-password\'" '
              "--user-tag=\"name:geonames-defaults,setup:bare-trial-security,race-configs-id:{},license:trial,"
-             "x-pack:true,x-pack-components:[\'security\']\" "
+             "x-pack:true,x-pack-components:security\" "
              '--runtime-jdk="8" --distribution-version="6.3.0" '
              '--pipeline="from-distribution"'.format(race_configs_id),
 
@@ -1045,7 +1045,7 @@ def test_run_trial_release_benchmarks_with_x_pack_module(self, mocked_wait_until
              '--client-options="timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:\'rally\''
              ',basic_auth_password:\'rally-password\'" '
              "--user-tag=\"name:geonames-4g,setup:bare-trial-security,race-configs-id:{},license:trial,"
-             "x-pack:true,x-pack-components:[\'security\']\" "
+             "x-pack:true,x-pack-components:security\" "
              '--runtime-jdk="8" --distribution-version="6.3.0" '
              '--pipeline="from-distribution"'.format(race_configs_id)]
             ,