Update chromium_mac recipe for re-imaged testers.

Update chromium_mac recipe for re-imaged testers.

This is a companion change to https://codereview.chromium.org/701623002/

BUG=412374, 412376
TBR=agable@chromium.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=292835

[Robert Sesek, 2014-11-04 15:53:12]

rsesek@chromium.org changed reviewers:
+ iannucci@chromium.org

[Robert Sesek, 2014-11-04 15:53:12]

https://codereview.chromium.org/696353005/diff/20001/scripts/slave/recipes/ch...
File scripts/slave/recipes/chromium_trybot.py (right):

https://codereview.chromium.org/696353005/diff/20001/scripts/slave/recipes/ch...
scripts/slave/recipes/chromium_trybot.py:361: 'testers': ['Mac10.8 Tests'],
Not exactly sure about this one, but all our trybots are on 10.8 I believe.

[Robert Sesek, 2014-11-04 20:24:05]

rsesek@chromium.org changed reviewers:
+ agable@chromium.org

[Robert Sesek, 2014-11-04 20:24:06]

+agable

[smut, 2014-11-04 20:40:45]

smut@google.com changed reviewers:
+ smut@google.com

[smut, 2014-11-04 20:40:45]

lgtm

[smut, 2014-11-04 20:43:53]

https://codereview.chromium.org/696353005/diff/20001/scripts/slave/recipes/ch...
File scripts/slave/recipes/chromium_trybot.py (right):

https://codereview.chromium.org/696353005/diff/20001/scripts/slave/recipes/ch...
scripts/slave/recipes/chromium_trybot.py:361: 'testers': ['Mac10.8 Tests'],
On 2014/11/04 15:53:12, Robert Sesek wrote:
> Not exactly sure about this one, but all our trybots are on 10.8 I believe.

If all VMs backing mac_chromium_rel_ng have the same config (which they should),
then your assumption is correct:
vm693-m4:~ chrome-bot$ sw_vers
ProductName:	Mac OS X
ProductVersion:	10.8.5
BuildVersion:	12F45

[Robert Sesek, 2014-11-04 20:46:53]

The CQ bit was checked by rsesek@chromium.org

[commit-bot: I haz the power, 2014-11-04 20:47:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/696353005/20001

[commit-bot: I haz the power, 2014-11-04 20:48:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-04 20:48:03]

Failed to apply patch for
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A        
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
  Copied
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json
->
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
  patching file
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
  Hunk #6 succeeded at 221 (offset 3 lines).
  Hunk #7 succeeded at 246 (offset 5 lines).
  Hunk #8 FAILED at 279.
  Hunk #9 FAILED at 315.
  Hunk #10 succeeded at 279 (offset -83 lines).
  2 out of 10 hunks FAILED -- saving rejects to file
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json.rej

Patch:   NR 
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json->build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
Index:
scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
diff --git
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
similarity index 79%
rename from
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json
rename to
build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
index
42f90775659985d6e0ffcbf5692b475632ea0254..2df844b2d5495967a97ba9b7583d571a39ea3b82
100644
---
a/build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json
+++
b/build/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
@@ -7,7 +7,7 @@
       "--master",
       "chromium.mac",
       "--builder",
-      "Mac10.6 Tests (1)",
+      "Mac10.6 Tests",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -107,7 +107,7 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@path:
[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"Mac10.6 Tests (1)\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"Mac10.6 Tests\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"swarming\": {@@@",
@@ -134,7 +134,7 @@
       "--paths",
       "{\"build\": \"[BUILD]\"}",
       "--properties",
-      "{\"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571,
\"slavename\": \"TestSlavename\"}"
+      "{\"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571,
\"slavename\": \"TestSlavename\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
@@ -178,9 +178,9 @@
       "--build-archive-url",
       "gs://test-domain/test-archive.zip",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}"
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}"
     ],
     "name": "extract build"
   },
@@ -199,7 +199,7 @@
       "--shards",
       "1",
       "--task-name",
-      "browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests (1)/571",
+      "browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests/571",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -218,7 +218,7 @@
       "pool",
       "Chrome",
       "--tag",
-      "buildername:Mac10.6 Tests (1)",
+      "buildername:Mac10.6 Tests",
       "--tag",
       "buildnumber:571",
       "--tag",
@@ -241,9 +241,9 @@
     "name": "[trigger] browser_tests on Mac-10.6",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\":
\"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests (1)/571\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\":
\"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@   
\"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests (1)/571\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@   
\"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests/571\": {@@@",
       "@@@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\"@@@",
@@ -279,19 +279,19 @@
       "--target",
       "Release",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}",
       "--annotate=gtest",
       "--test-type=telemetry_unittests",
-      "--builder-name=Mac10.6 Tests (1)",
+      "--builder-name=Mac10.6 Tests",
       "--slave-name=TestSlavename",
       "--build-number=571",
       "--run-python-script",
       "[SLAVE_BUILD]/src/tools/telemetry/run_tests",
       "--browser=release",
       "--retry-limit=3",
-      "--builder-name=Mac10.6 Tests (1)",
+      "--builder-name=Mac10.6 Tests",
       "--master-name=chromium.mac",
       "--test-results-server=test-results.appspot.com",
       "--test-type=telemetry_unittests",
@@ -315,19 +315,19 @@
       "--target",
       "Release",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"],
\"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"mastername\":
\"chromium.mac\", \"parent_build_archive_url\":
\"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\",
\"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\":
\"TestSlavename\", \"swarm_hashes\": {\"browser_tests\":
\"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\":
\"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chro…
(message too large)

[Robert Sesek, 2014-11-04 21:05:08]

The CQ bit was checked by rsesek@chromium.org

[commit-bot: I haz the power, 2014-11-04 21:06:08]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/696353005/40001

[commit-bot: I haz the power, 2014-11-04 21:07:37]

Committed patchset #3 (id:40001) as 292835

[M-A Ruel, 2014-11-04 23:10:29]

maruel@chromium.org changed reviewers:
+ maruel@chromium.org

[M-A Ruel, 2014-11-04 23:10:30]

https://codereview.chromium.org/696353005/diff/40001/scripts/slave/recipe_mod...
File scripts/slave/recipe_modules/chromium/chromium_mac.py (right):

https://codereview.chromium.org/696353005/diff/40001/scripts/slave/recipe_mod...
scripts/slave/recipe_modules/chromium/chromium_mac.py:80: 'os': 'Mac-10.9',
It should be in section 'swarming_dimensions'.

[Robert Sesek, 2014-11-04 23:22:16]

https://codereview.chromium.org/696353005/diff/40001/scripts/slave/recipe_mod...
File scripts/slave/recipe_modules/chromium/chromium_mac.py (right):

https://codereview.chromium.org/696353005/diff/40001/scripts/slave/recipe_mod...
scripts/slave/recipe_modules/chromium/chromium_mac.py:80: 'os': 'Mac-10.9',
On 2014/11/04 23:10:30, M-A Ruel wrote:
> It should be in section 'swarming_dimensions'.

Fixed with https://codereview.chromium.org/693183004/.