Ignore --avd-config parameter in monochrome_python_tests.py

BUG=1137405 Change-Id: If6fd7bdb252524ca0d72da4499b5743d477cfc2a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2468739 Reviewed-by: Dirk Pranke <dpranke@google.com> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Yaron Friedman <yfriedman@chromium.org> Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org> Cr-Commit-Position: refs/heads/master@{#817224}
Denger-Network · Oct 14, 2020 · 38ed04d · 38ed04d
1 parent 658a9f8
commit 38ed04d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/chrome/android/monochrome/scripts/monochrome_python_tests.py b/chrome/android/monochrome/scripts/monochrome_python_tests.py
@@ -41,6 +41,9 @@ def create_argument_parser():
       '--system-webview-pathmap',
       help='The system webview APK resources pathmap path.')
 
+  # --avd-config parameter is unused. Add it to the parser because typ.Runner
+  # checks that all arguments are known. crbug.com/1084351
+  parser.add_argument('--avd-config', help='Unused')
   return parser
 
 

diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
@@ -33778,6 +33778,42 @@
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test_id_prefix": "ninja://components:components_perftests/"
+      },
+      {
+        "args": [
+          "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
+        ],
+        "isolate_name": "monochrome_public_apk_checker",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "monochrome_public_apk_checker",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "device_os": null,
+              "device_type": null,
+              "machine_type": "n1-standard-4",
+              "os": "Ubuntu-16.04",
+              "pool": "chromium.tests.avd"
+            }
+          ],
+          "named_caches": [
+            {
+              "name": "avd_generic_android23",
+              "path": ".android"
+            },
+            {
+              "name": "system_images_android_23_google_apis_x86",
+              "path": ".emulator_sdk"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
       }
     ]
   },

diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
@@ -1722,11 +1722,6 @@
         },
       },
     },
-    'remove_from': [
-      # TODO(crbug.com/1137405): Re-enable once the test harness supports
-      # the --avd-config flag.
-      'android-marshmallow-x86-rel-non-cq',
-    ],
   },
   'monochrome_public_test_ar_apk': {
     'modifications': {