Add android_optional_gpu_tests_rel to master.tryserver.chromium.android.

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_optional_gpu_tests_rel.json

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_optional_gpu_tests_rel.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_android_angle_rel_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_optional_gpu_tests_rel.json
similarity index 90%
copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_android_angle_rel_ng.json
copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_optional_gpu_tests_rel.json
index f688007176660f31178032ac65d0514f6709ff6f..e36837401fc26e8cc230e142a967815e56e2ca6a 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_android_angle_rel_ng.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_optional_gpu_tests_rel.json
@@ -4,7 +4,7 @@
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[BUILDER_CACHE]/android_angle_rel_ng",
+      "[BUILDER_CACHE]/android_optional_gpu_tests_rel",
       "511"
     ],
     "name": "makedirs checkout path",
@@ -27,9 +27,9 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
-      "tryserver.chromium.angle",
+      "tryserver.chromium.android",
       "--builder",
-      "android_angle_rel_ng",
+      "android_optional_gpu_tests_rel",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -52,7 +52,7 @@
       "src@HEAD",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]/android_angle_rel_ng",
+    "cwd": "[BUILDER_CACHE]/android_optional_gpu_tests_rel",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -190,7 +190,7 @@
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_angle_rel_ng/src/tools/swarming_client/swarming.py",
+      "[BUILDER_CACHE]/android_optional_gpu_tests_rel/src/tools/swarming_client/swarming.py",
       "--version"
     ],
     "name": "swarming.py --version",
@@ -206,13 +206,13 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[BUILDER_CACHE]/android_angle_rel_ng/src",
+    "cwd": "[BUILDER_CACHE]/android_optional_gpu_tests_rel/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_CROSSCOMPILE": "1",
       "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm64 test_isolation_mode=prepare use_goma=1",
-      "PATH": "[BUILDER_CACHE]/android_angle_rel_ng/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_angle_rel_ng/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "[BUILDER_CACHE]/android_optional_gpu_tests_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_optional_gpu_tests_rel/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks (with patch)"
   },
@@ -220,7 +220,7 @@
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_angle_rel_ng/src/testing/scripts/get_compile_targets.py",
+      "[BUILDER_CACHE]/android_optional_gpu_tests_rel/src/testing/scripts/get_compile_targets.py",
       "--output",
       "/path/to/tmp/json",
       "--",
@@ -228,9 +228,9 @@
       "Release",
       "--use-src-side-runtest-py",
       "--paths",
-      "{\"checkout\": \"[BUILDER_CACHE]/android_angle_rel_ng/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+      "{\"checkout\": \"[BUILDER_CACHE]/android_optional_gpu_tests_rel/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
       "--properties",
-      "{\"buildername\": \"android_angle_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.angle\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+      "{\"buildername\": \"android_optional_gpu_tests_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
@@ -243,12 +243,12 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]/android_angle_rel_ng/src/testing/buildbot/chromium.gpu.fyi.json",
+      "[BUILDER_CACHE]/android_optional_gpu_tests_rel/src/testing/buildbot/chromium.gpu.fyi.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.gpu.fyi.json)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]/android_angle_rel_ng/src/testing/buildbot/chromium.gpu.fyi.json@@@",
+      "@@@STEP_TEXT@path: [BUILDER_CACHE]/android_optional_gpu_tests_rel/src/testing/buildbot/chromium.gpu.fyi.json@@@",
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
@@ -274,7 +274,7 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]/android_angle_rel_ng/src/testing/buildbot/trybot_analyze_config.json",
+      "[BUILDER_CACHE]/android_optional_gpu_tests_rel/src/testing/buildbot/trybot_analyze_config.json",
       "/path/to/tmp/json"
     ],
     "name": "read filter exclusion spec",