From 37be4d013520906891c1a0908874314d1fdce265 Mon Sep 17 00:00:00 2001 From: stephana Date: Fri, 4 Nov 2016 08:35:55 -0700 Subject: [PATCH] Re-enable iOS testing BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2469863009 Review-Url: https://codereview.chromium.org/2469863009 --- ...S-Clang-iPad4-GPU-SGX554-Arm7-Release.json | 22 +++++++++---------- infra/bots/recipes/swarm_trigger.py | 7 ++++-- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json index cebeb0291f..c6e49a079c 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json @@ -513,7 +513,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"iOS-9.2\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"iOS-9.3.1\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" @@ -593,7 +593,7 @@ "--shards", "1", "--task-name", - "test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5", + "test_skia/iOS-9.3.1/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -604,10 +604,10 @@ "14400", "--dimension", "device", - "iPad4,1", + "iPad5,1", "--dimension", "os", - "iOS-9.2", + "iOS-9.3.1", "--dimension", "pool", "Skia", @@ -624,13 +624,13 @@ "--tag", "name:test_skia", "--tag", - "os:iOS-9.2", + "os:iOS-9.3.1", "--tag", "revision:abc123", "--tag", "slavename:skiabot-linux-swarm-000", "--tag", - "stepname:test_skia on iOS-9.2", + "stepname:test_skia on iOS-9.3.1", "--cipd-package", "skp:skia/bots/skp:version:0", "--cipd-package", @@ -650,12 +650,12 @@ "swarm_out_dir=${ISOLATED_OUTDIR}", "revision=abc123" ], - "name": "[trigger] test_skia on iOS-9.2", + "name": "[trigger] test_skia on iOS-9.3.1", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/iOS-9.3.1/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"test_skia/iOS-9.3.1/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -678,11 +678,11 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\", \"tasks\": {\"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"test_skia/iOS-9.3.1/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\", \"tasks\": {\"test_skia/iOS-9.3.1/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json" ], - "name": "test_skia on iOS-9.2", + "name": "test_skia on iOS-9.3.1", "~followup_annotations": [ "@@@STEP_TEXT@swarming pending 71s@@@", "@@@STEP_LOG_LINE@json.output@{@@@", diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py index 41470eba68..2547c79b97 100644 --- a/infra/bots/recipes/swarm_trigger.py +++ b/infra/bots/recipes/swarm_trigger.py @@ -140,10 +140,13 @@ def swarm_dimensions(builder_cfg): elif 'iOS' in builder_cfg['os']: # For iOS, the device type is a better dimension than CPU or GPU. dimensions['device'] = { - 'iPad4': 'iPad4,1', + # TODO(stephana): Remove this temporary discrepancy between the bot name + # and device. When we expand iOS testing names and devices need to match + # again. + 'iPad4': 'iPad5,1', }[builder_cfg['model']] # TODO(borenet): Replace this hack with something better. - dimensions['os'] = 'iOS-9.2' + dimensions['os'] = 'iOS-9.3.1' elif builder_cfg['cpu_or_gpu'] == 'CPU': dimensions['gpu'] = 'none' dimensions['cpu'] = {