From 72b5dbc44b0d01ea189aa888218d7a6b99b4da81 Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Mon, 13 Jun 2022 09:37:18 +0200
Subject: [PATCH] Don't run quick perf tests on baremetal machines.

Baremetal machines have webcams and it makes it confusing wether webrtc_perf_tests require cameras to run.

Change-Id: I1f3dc05c976ed008079f990b9a55f3310ea73dda
Bug: b/235780120
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265641
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#37189}
---
 infra/specs/test_suites.pyl       | 38 +++++++------------------------
 infra/specs/tryserver.webrtc.json |  9 +++-----
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index 774f0cdb49..50516ba654 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -186,15 +186,6 @@
         'mixins': ['linux', 'baremetal-try-pool'],
       }
     },
-    'linux_webrtc_perf_tests_tryserver': {
-      'webrtc_perf_tests': {
-        'remove_mixins': ['linux-bionic', 'resultdb-json-format'],
-        'mixins': [
-          'linux', 'baremetal-try-pool', 'quick-perf-tests',
-          'resultdb-gtest-json-format'
-        ],
-      }
-    },
     'mac_video_capture_tests': {
       'video_capture_tests': {
         'remove_mixins': ['mac11'],
@@ -207,15 +198,6 @@
         'mixins': ['mac', 'baremetal-try-pool'],
       }
     },
-    'mac_webrtc_perf_tests_tryserver': {
-      'webrtc_perf_tests': {
-        'remove_mixins': ['mac11', 'resultdb-json-format'],
-        'mixins': [
-          'mac', 'baremetal-try-pool', 'quick-perf-tests',
-          'resultdb-gtest-json-format'
-        ],
-      }
-    },
     'more_configs_tests': {
       'peerconnection_unittests': {
         'swarming': {
@@ -228,6 +210,11 @@
         'mixins': ['perf-webrtc-perf-tests'],
       },
     },
+    'webrtc_perf_tests_tryserver': {
+      'webrtc_perf_tests': {
+        'mixins': ['quick-perf-tests', 'resultdb-gtest-json-format'],
+      }
+    },
     'win_video_capture_tests': {
       'video_capture_tests': {
         'remove_mixins': ['win7'],
@@ -240,15 +227,6 @@
         'mixins': ['win', 'baremetal-try-pool'],
       }
     },
-    'win_webrtc_perf_tests_tryserver': {
-      'webrtc_perf_tests': {
-        'remove_mixins': ['win7', 'resultdb-json-format'],
-        'mixins': [
-          'win', 'baremetal-try-pool', 'quick-perf-tests',
-          'resultdb-gtest-json-format'
-        ],
-      }
-    },
   },
   'compound_suites': {
     'android_tests_tryserver': [
@@ -262,7 +240,7 @@
     'linux_tests_tryserver': [
       'desktop_tests',
       'linux_video_capture_tests_tryserver',
-      'linux_webrtc_perf_tests_tryserver',
+      'webrtc_perf_tests_tryserver',
     ],
     'mac_tests': [
       'desktop_tests',
@@ -271,7 +249,7 @@
     'mac_tests_tryserver': [
       'desktop_tests',
       'mac_video_capture_tests_tryserver',
-      'mac_webrtc_perf_tests_tryserver',
+      'webrtc_perf_tests_tryserver',
     ],
     'win_tests': [
       'desktop_tests',
@@ -280,7 +258,7 @@
     'win_tests_tryserver': [
       'desktop_tests',
       'win_video_capture_tests_tryserver',
-      'win_webrtc_perf_tests_tryserver',
+      'webrtc_perf_tests_tryserver',
     ],
   },
 }
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 5f5057ac37..55932831d9 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -7568,8 +7568,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal-try"
+              "os": "Ubuntu-18.04"
             }
           ]
         },
@@ -11376,8 +11375,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal-try"
+              "os": "Mac-11"
             }
           ]
         },
@@ -14326,8 +14324,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Windows",
-              "pool": "WebRTC-baremetal-try"
+              "os": "Windows-7-SP1"
             }
           ]
         },