weblayer: updates skew test versions

As 87 has branched, this now tests 87, 86 and 85.
As we know 84 isn't being used at this point, it's dropped.

BUG=none
TEST=test only changes

Change-Id: I2d5066c5a05465ee70f372ef1766f9978f989e92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472445Reviewed-by: Rakib Hasan <rmhasan@google.com>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817253}

testing/buildbot/chromium.android.fyi.json

@@ -3081,12 +3081,12 @@
           "--test-runner-outdir",
           ".",
           "--client-outdir",
-          ".",
+          "../../weblayer_instrumentation_test_M85/out/Release",
           "--implementation-outdir",
-          "../../weblayer_instrumentation_test_M84/out/Release",
+          ".",
           "--test-expectations",
           "../../weblayer/browser/android/javatests/skew/expectations.txt",
-          "--impl-version=84",
+          "--client-version=85",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
           "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
@@ -3096,18 +3096,18 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "weblayer_instrumentation_test_versions_apk_M84_Implementation_Library_Tests"
+            "weblayer_instrumentation_test_versions_apk_M85_Client_Library_Tests"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
-        "name": "weblayer_instrumentation_test_versions_apk_M84_Implementation_Library_Tests",
+        "name": "weblayer_instrumentation_test_versions_apk_M85_Client_Library_Tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/weblayer-x86",
-              "location": "weblayer_instrumentation_test_M84",
-              "revision": "version:dup-84.0.4147.89"
+              "location": "weblayer_instrumentation_test_M85",
+              "revision": "version:85.0.4183.81"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -3155,12 +3155,12 @@
           "--test-runner-outdir",
           ".",
           "--client-outdir",
-          "../../weblayer_instrumentation_test_M85/out/Release",
-          "--implementation-outdir",
           ".",
+          "--implementation-outdir",
+          "../../weblayer_instrumentation_test_M85/out/Release",
           "--test-expectations",
           "../../weblayer/browser/android/javatests/skew/expectations.txt",
-          "--client-version=85",
+          "--impl-version=85",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
           "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
@@ -3170,18 +3170,18 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "weblayer_instrumentation_test_versions_apk_M85_Client_Library_Tests"
+            "weblayer_instrumentation_test_versions_apk_M85_Implementation_Library_Tests"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
-        "name": "weblayer_instrumentation_test_versions_apk_M85_Client_Library_Tests",
+        "name": "weblayer_instrumentation_test_versions_apk_M85_Implementation_Library_Tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M85",
-              "revision": "version:85.0.4183.81"
+              "revision": "version:85.0.4183.140"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -3229,12 +3229,12 @@
           "--test-runner-outdir",
           ".",
           "--client-outdir",
-          ".",
+          "../../weblayer_instrumentation_test_M86/out/Release",
           "--implementation-outdir",
-          "../../weblayer_instrumentation_test_M85/out/Release",
+          ".",
           "--test-expectations",
           "../../weblayer/browser/android/javatests/skew/expectations.txt",
-          "--impl-version=85",
+          "--client-version=86",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
           "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
@@ -3244,18 +3244,18 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "weblayer_instrumentation_test_versions_apk_M85_Implementation_Library_Tests"
+            "weblayer_instrumentation_test_versions_apk_M86_Client_Library_Tests"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
-        "name": "weblayer_instrumentation_test_versions_apk_M85_Implementation_Library_Tests",
+        "name": "weblayer_instrumentation_test_versions_apk_M86_Client_Library_Tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/weblayer-x86",
-              "location": "weblayer_instrumentation_test_M85",
-              "revision": "version:85.0.4183.140"
+              "location": "weblayer_instrumentation_test_M86",
+              "revision": "version:86.0.4240.75"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -3303,12 +3303,12 @@
           "--test-runner-outdir",
           ".",
           "--client-outdir",
-          "../../weblayer_instrumentation_test_M86/out/Release",
-          "--implementation-outdir",
           ".",
+          "--implementation-outdir",
+          "../../weblayer_instrumentation_test_M86/out/Release",
           "--test-expectations",
           "../../weblayer/browser/android/javatests/skew/expectations.txt",
-          "--client-version=86",
+          "--impl-version=86",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
           "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
@@ -3318,11 +3318,11 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "weblayer_instrumentation_test_versions_apk_M86_Client_Library_Tests"
+            "weblayer_instrumentation_test_versions_apk_M86_Implementation_Library_Tests"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
-        "name": "weblayer_instrumentation_test_versions_apk_M86_Client_Library_Tests",
+        "name": "weblayer_instrumentation_test_versions_apk_M86_Implementation_Library_Tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
@@ -3379,10 +3379,10 @@
           "--client-outdir",
           ".",
           "--implementation-outdir",
-          "../../weblayer_instrumentation_test_M86/out/Release",
+          "../../weblayer_instrumentation_test_M87/out/Release",
           "--test-expectations",
           "../../weblayer/browser/android/javatests/skew/expectations.txt",
-          "--impl-version=86",
+          "--impl-version=87",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
           "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
@@ -3392,18 +3392,18 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "weblayer_instrumentation_test_versions_apk_M86_Implementation_Library_Tests"
+            "weblayer_instrumentation_test_versions_apk_M87_Implementation_Library_Tests"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
-        "name": "weblayer_instrumentation_test_versions_apk_M86_Implementation_Library_Tests",
+        "name": "weblayer_instrumentation_test_versions_apk_M87_Implementation_Library_Tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/weblayer-x86",
-              "location": "weblayer_instrumentation_test_M86",
-              "revision": "version:86.0.4240.75"
+              "location": "weblayer_instrumentation_test_M87",
+              "revision": "version:87.0.4280.20"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",

testing/buildbot/variants.pyl

@@ -314,18 +314,18 @@
       '--client-outdir',
       '.',
       '--implementation-outdir',
-      '../../weblayer_instrumentation_test_M86/out/Release',
+      '../../weblayer_instrumentation_test_M87/out/Release',
       '--test-expectations',
       '../../weblayer/browser/android/javatests/skew/expectations.txt',
-      '--impl-version=86',
+      '--impl-version=87',
     ],
-    'identifier': 'M86_Implementation_Library_Tests',
+    'identifier': 'M87_Implementation_Library_Tests',
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/weblayer-x86',
-          'location': 'weblayer_instrumentation_test_M86',
-          'revision': 'version:86.0.4240.75',
+          'location': 'weblayer_instrumentation_test_M87',
+          'revision': 'version:87.0.4280.20',
         }
       ],
     },
@@ -337,18 +337,18 @@
       '--client-outdir',
       '.',
       '--implementation-outdir',
-      '../../weblayer_instrumentation_test_M85/out/Release',
+      '../../weblayer_instrumentation_test_M86/out/Release',
       '--test-expectations',
       '../../weblayer/browser/android/javatests/skew/expectations.txt',
-      '--impl-version=85',
+      '--impl-version=86',
     ],
-    'identifier': 'M85_Implementation_Library_Tests',
+    'identifier': 'M86_Implementation_Library_Tests',
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/weblayer-x86',
-          'location': 'weblayer_instrumentation_test_M85',
-          'revision': 'version:85.0.4183.140',
+          'location': 'weblayer_instrumentation_test_M86',
+          'revision': 'version:86.0.4240.75',
         }
       ],
     },
@@ -360,18 +360,18 @@
       '--client-outdir',
       '.',
       '--implementation-outdir',
-      '../../weblayer_instrumentation_test_M84/out/Release',
+      '../../weblayer_instrumentation_test_M85/out/Release',
       '--test-expectations',
       '../../weblayer/browser/android/javatests/skew/expectations.txt',
-      '--impl-version=84',
+      '--impl-version=85',
     ],
-    'identifier': 'M84_Implementation_Library_Tests',
+    'identifier': 'M85_Implementation_Library_Tests',
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/weblayer-x86',
-          'location': 'weblayer_instrumentation_test_M84',
-          'revision': 'version:dup-84.0.4147.89',
+          'location': 'weblayer_instrumentation_test_M85',
+          'revision': 'version:85.0.4183.140',
         }
       ],
     },