diff --git a/night_rally/night_rally.py b/night_rally/night_rally.py index 6575c4e27a064..37d5f8d24de70 100644 --- a/night_rally/night_rally.py +++ b/night_rally/night_rally.py @@ -17,8 +17,9 @@ ROOT = os.path.dirname(os.path.realpath(__file__)) RALLY_BINARY = "rally --skip-update" VERSION_PATTERN = re.compile(r"^(\d+)\.(\d+)\.(\d+)(?:-(.+))?$") -# The port that Elasticsearch is configured to use for rest requests -TARGET_PORT = 39200 +# The port that Elasticsearch is configured to use for rest requests. +TARGET_HTTP_PORT = 9200 +TARGET_TRANSPORT_PORT = 9300 RACE_CONFIGS_SCHEMA_FILE = "{}/resources/race-configs-schema.json".format(ROOT) # console logging @@ -564,7 +565,8 @@ def validate_race_configs(race_configs): def run_rally(tracks, release_params, available_hosts, command, dry_run=False, skip_ansible=False, system=os.system): # Build list of host:port pairs for target hosts - available_hosts_with_ports = list(map(lambda x: "{}:{}".format(x, TARGET_PORT), available_hosts)) + available_hosts_with_http_ports = list(map(lambda h: f"{h}:{TARGET_HTTP_PORT}", available_hosts)) + available_hosts_with_transport_ports = list(map(lambda h: f"{h}:{TARGET_TRANSPORT_PORT}", available_hosts)) rally_failure = False if dry_run: runner = logger.info @@ -589,7 +591,7 @@ def run_rally(tracks, release_params, available_hosts, command, dry_run=False, s # TODO refactor encapsulation in Release/Docker Command configuration["license"] = release_params["license"] if release_params else license_config["name"] - race_cfg = RaceConfig(track_name, track_repository, configuration, available_hosts_with_ports) + race_cfg = RaceConfig(track_name, track_repository, configuration, available_hosts_with_http_ports) if race_cfg.target_hosts: if command.runnable(race_cfg): @@ -605,7 +607,8 @@ def run_rally(tracks, release_params, available_hosts, command, dry_run=False, s start = time.perf_counter() try: if not dry_run: - wait_until_port_is_free(available_hosts_with_ports) + wait_until_port_is_free(available_hosts_with_http_ports) + wait_until_port_is_free(available_hosts_with_transport_ports) cmd = command.command_line(race_cfg) logger.info("Executing [%s]", cmd) if runner(cmd): diff --git a/tests/night_rally_test.py b/tests/night_rally_test.py index ab530853cd9b5..e33be11d545c5 100644 --- a/tests/night_rally_test.py +++ b/tests/night_rally_test.py @@ -53,7 +53,7 @@ def test_components_ignores_invalid_versions(self): class WaitUntilPortFreeTests(unittest.TestCase): - multi_host_string = "192.168.14.3:39200,192.168.14.4:39200,192.168.14.5:39200".split(",") + multi_host_string = "192.168.14.3:9200,192.168.14.4:9200,192.168.14.5:9200".split(",") single_host_string = "192.168.2.3:9200".split(",") single_host_no_port = "192.168.2.4" @@ -357,14 +357,14 @@ def test_run_two_oss_challenges_successfully(self, mocked_wait_until_port_is_fre self.assertEqual(2, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-append-1node,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" " "--revision=\"@2016-01-01T00:00:00Z\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts-index-only\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-append-4g-1node,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " @@ -410,7 +410,7 @@ def test_exclude_tasks_option(self, mocked_wait_until_port_is_free): night_rally.run_rally(tracks, None, ["localhost"], cmd, skip_ansible=True, system=system_call) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-append-1node,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " @@ -456,7 +456,7 @@ def test_overwrite_runtime_jdk_successfully(self, mocked_wait_until_port_is_free night_rally.run_rally(tracks, None, ["localhost"], cmd, skip_ansible=True, system=system_call) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-append-1node,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"13\" " @@ -527,26 +527,26 @@ def test_run_two_mixed_license_challenges_successfully(self, mocked_wait_until_p self.assertEqual(4, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" " "--revision=\"@2016-01-01T00:00:00Z\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-4g,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-01-01T00:00:00Z\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults,basic-license\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,race-configs-id:{},license:basic\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-01-01T00:00:00Z\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap,basic-license\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-4g,setup:bare,race-configs-id:{},license:basic\" --runtime-jdk=\"8\" " @@ -611,13 +611,13 @@ def test_run_two_oss_tracks_successfully(self, mocked_wait_until_port_is_free): self.assertEqual(2, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-10-01T00:00:00Z\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"percolator\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:percolator-4g,setup:bare,race-configs-id:{},license:oss\" " @@ -741,26 +741,26 @@ def test_run_three_sets_of_mixed_license_tracks_successfully(self, mocked_wait_u self.assertEqual(6, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-10-01T00:00:00Z\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap,basic-license\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-append-4g-3nodes,setup:bare,race-configs-id:{},license:basic\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-10-01T00:00:00Z\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults,trial-license\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,race-configs-id:{},license:trial\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-10-01T00:00:00Z\"".format(race_configs_id), 'rally --skip-update --configuration-name="nightly" --quiet ' - '--target-host="localhost:39200" --effective-start-date="2016-10-01 00:00:00" ' + '--target-host="localhost:9200" --effective-start-date="2016-10-01 00:00:00" ' '--track-repository="default" --track="geonames" --challenge="append-no-conflicts" ' '--car="defaults,trial-license,x-pack-security" ' '--client-options="timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:\'rally\'' @@ -772,7 +772,7 @@ def test_run_three_sets_of_mixed_license_tracks_successfully(self, mocked_wait_u '--pipeline="from-sources-complete" --revision="@2016-10-01T00:00:00Z"'.format(race_configs_id), 'rally --skip-update --configuration-name="nightly" --quiet ' - '--target-host="localhost:39200" --effective-start-date="2016-10-01 00:00:00" ' + '--target-host="localhost:9200" --effective-start-date="2016-10-01 00:00:00" ' '--track-repository="default" --track="percolator" --challenge="append-no-conflicts" ' '--car="4gheap,trial-license,x-pack-security" ' '--client-options="timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:\'rally\'' @@ -783,7 +783,7 @@ def test_run_three_sets_of_mixed_license_tracks_successfully(self, mocked_wait_u '--revision="@2016-10-01T00:00:00Z"'.format(race_configs_id), 'rally --skip-update --configuration-name="nightly" --quiet ' - '--target-host="localhost:39200" --effective-start-date="2016-10-01 00:00:00" ' + '--target-host="localhost:9200" --effective-start-date="2016-10-01 00:00:00" ' '--track-repository="default" --track="percolator" --challenge="append-no-conflicts" ' '--car="defaults,trial-license,x-pack-security" ' '--client-options="timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:\'rally\'' @@ -855,13 +855,13 @@ def test_run_adhoc_benchmark(self, mocked_wait_until_port_is_free): self.assertEqual(2, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"lucene-7\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"lucene-7\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"eventdata\" --track=\"eventdata\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:eventdata-defaults,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"66202dc\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"lucene-7\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"lucene-7\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"percolator\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:percolator-4g,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" " @@ -912,14 +912,14 @@ def test_run_release_benchmark_without_plugins(self, mocked_wait_until_port_is_f self.assertEqual(2, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare-oss,race-configs-id:{},license:oss\" " "--runtime-jdk=\"8\" --distribution-version=\"5.3.0\" " "--pipeline=\"from-distribution\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-4g,setup:bare-oss,race-configs-id:{},license:oss\" " @@ -1017,7 +1017,7 @@ def test_run_release_benchmark_with_plugins(self, mocked_wait_until_port_is_free self.assertEqual(3, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" " "--client-options=\"timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:'rally'," @@ -1028,7 +1028,7 @@ def test_run_release_benchmark_with_plugins(self, mocked_wait_until_port_is_free "--elasticsearch-plugins=\"x-pack:security+monitoring\" " "--distribution-version=\"5.4.0\" --pipeline=\"from-distribution\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" " "--client-options=\"timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:'rally'," @@ -1039,7 +1039,7 @@ def test_run_release_benchmark_with_plugins(self, mocked_wait_until_port_is_free "--elasticsearch-plugins=\"x-pack:security+monitoring\" --distribution-version=\"5.4.0\" " "--pipeline=\"from-distribution\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-ml\" --car=\"4gheap\" " "--client-options=\"timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:'rally'," @@ -1110,7 +1110,7 @@ def test_run_trial_release_benchmarks_with_x_pack_module(self, mocked_wait_until self.assertEqual(2, len(system_call.calls)) self.assertEqual( ['rally --skip-update --configuration-name="release" --quiet ' - '--target-host="localhost:39200" --effective-start-date="2016-01-01 00:00:00" ' + '--target-host="localhost:9200" --effective-start-date="2016-01-01 00:00:00" ' '--track-repository="default" --track="geonames" --challenge="append-no-conflicts" ' '--car="defaults,trial-license,x-pack-security" ' '--client-options="timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:\'rally\'' @@ -1121,7 +1121,7 @@ def test_run_trial_release_benchmarks_with_x_pack_module(self, mocked_wait_until '--pipeline="from-distribution"'.format(race_configs_id), 'rally --skip-update --configuration-name="release" --quiet ' - '--target-host="localhost:39200" --effective-start-date="2016-01-01 00:00:00" ' + '--target-host="localhost:9200" --effective-start-date="2016-01-01 00:00:00" ' '--track-repository="default" --track="geonames" --challenge="append-no-conflicts" ' '--car="4gheap,trial-license,x-pack-security" ' '--client-options="timeout:240,use_ssl:true,verify_certs:false,basic_auth_user:\'rally\'' @@ -1189,7 +1189,7 @@ def test_run_release_benchmark_with_basic_license(self, mocked_wait_until_port_i self.assertEqual( [ 'rally --skip-update --configuration-name="release" --quiet ' - '--target-host="localhost:39200" --effective-start-date="2016-01-01 00:00:00" ' + '--target-host="localhost:9200" --effective-start-date="2016-01-01 00:00:00" ' '--track-repository="default" --track="geonames" --challenge="append-no-conflicts" ' '--car="defaults,basic-license" ' '--client-options="timeout:240" ' @@ -1241,7 +1241,7 @@ def test_run_release_benchmark_with_transport_nio(self, mocked_wait_until_port_i self.assertEqual( [ 'rally --skip-update --configuration-name="release" --quiet ' - '--target-host="localhost:39200" --effective-start-date="2016-01-01 00:00:00" ' + '--target-host="localhost:9200" --effective-start-date="2016-01-01 00:00:00" ' '--track-repository="default" --track="geonames" --challenge="append-no-conflicts" ' '--car="defaults,unpooled" ' '--client-options="timeout:240" ' @@ -1410,7 +1410,7 @@ def test_run_docker_5x_benchmark(self, mocked_wait_until_port_is_free): self.assertEqual(2, len(system_call.calls)) self.assertEqual( [ - 'rally --skip-update --configuration-name="release" --quiet --target-host="localhost:39200" ' + 'rally --skip-update --configuration-name="release" --quiet --target-host="localhost:9200" ' '--effective-start-date="2016-01-01 00:00:00" --track-repository=\"default\" --track="geonames" ' '--challenge="append-no-conflicts" --car="defaults" --client-options="timeout:240" ' "--user-tag=\"name:geonames-defaults,setup:docker-oss,race-configs-id:{},license:oss\" " @@ -1419,7 +1419,7 @@ def test_run_docker_5x_benchmark(self, mocked_wait_until_port_is_free): '{{\\"xpack.security.enabled\\": \\"false\\", \\"xpack.ml.enabled\\": \\"false\\", ' '\\"xpack.monitoring.enabled\\": \\"false\\", \\"xpack.watcher.enabled\\": \\"false\\"}}}}"'.format(race_configs_id), - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-4g,setup:docker-oss,race-configs-id:{},license:oss\" " @@ -1474,14 +1474,14 @@ def test_run_docker_6x_benchmark(self, mocked_wait_until_port_is_free): self.assertEqual(2, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:docker-oss,race-configs-id:{},license:oss\" " "--runtime-jdk=\"8\" --distribution-version=\"6.3.0\" " "--pipeline=\"docker\"".format(race_configs_id), - "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-4g,setup:docker-oss,race-configs-id:{},license:oss\" " @@ -1590,13 +1590,13 @@ def test_run_continues_on_error(self, mocked_wait_until_port_is_free): self.assertEqual(2, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,license:oss\" --runtime-jdk=\"8\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-10-01T00:00:00Z\"", - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-10-01 00:00:00\" --track-repository=\"default\" --track=\"percolator\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:percolator-4g,setup:bare,license:oss\" --runtime-jdk=\"8\" " @@ -1646,7 +1646,7 @@ def test_run_with_telemetry_from_command_line(self, mocked_wait_until_port_is_fr self.assertEqual( [ "rally --skip-update --telemetry=\"jfr,gc,jit\" --telemetry-params=\"recording-template:profile\" " - "--configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "--configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,license:oss\" --runtime-jdk=\"8\" " @@ -1706,20 +1706,20 @@ def test_run_with_telemetry_from_race_config(self, mocked_wait_until_port_is_fre self.assertEqual(3, len(system_call.calls)) self.assertEqual( [ - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-defaults,setup:bare,license:oss\" --runtime-jdk=\"8\" " "--telemetry=\"jfr,gc,jit\" --telemetry-params=\"{\\\"recording-template\\\": \\\"profile\\\"}\" " "--pipeline=\"from-sources-complete\" --revision=\"@2016-01-01T00:00:00Z\"", - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-4g,setup:bare,license:oss\" --runtime-jdk=\"8\" " "--telemetry=\"gc\" --pipeline=\"from-sources-complete\" --revision=\"@2016-01-01T00:00:00Z\"", - "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" " + "rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:9200\" " "--effective-start-date=\"2016-01-01 00:00:00\" --track-repository=\"default\" --track=\"geonames\" " "--challenge=\"append-no-conflicts\" --car=\"8gheap\" --client-options=\"timeout:240\" " "--user-tag=\"name:geonames-8g,setup:bare,license:oss\" --runtime-jdk=\"8\" --on-error=\"abort\" "