Add GPU FYI Android dEQP Vk bots

Bug: 839893 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Change-Id: I8861024bb7cadc741ca8f1b366a95472d125ed90 Reviewed-on: https://chromium-review.googlesource.com/1055107 Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Cr-Commit-Position: refs/heads/master@{#557955}
marcosholgado · May 11, 2018 · de4c73a · de4c73a
1 parent f9673ee
commit de4c73a
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 16 deletions.
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
@@ -836,6 +836,34 @@ def EXPERIMENTAL_CONDITIONALLY(x):
       'swarming': True,
       'os_type': 'android',
     },
+    'Android FYI 32 dEQP Vk Release (Nexus 5X)': {
+      'swarming_dimensions': [
+        {
+          'device_type': 'bullhead',
+          'device_os': 'O',
+          'os': 'Android',
+          'pool': 'Chrome-GPU',
+        },
+      ],
+      'build_config': 'android-chromium',
+      'swarming': True,
+      'os_type': 'android',
+      'type': Types.DEQP,
+    },
+    'Android FYI 64 dEQP Vk Release (Nexus 5X)': {
+      'swarming_dimensions': [
+        {
+          'device_type': 'bullhead',
+          'device_os': 'O',
+          'os': 'Android',
+          'pool': 'Chrome-GPU',
+        },
+      ],
+      'build_config': 'android-chromium',
+      'swarming': True,
+      'os_type': 'android',
+      'type': Types.DEQP,
+    },
 
     # The following "optional" testers don't actually exist on the
     # waterfall. They are present here merely to specify additional
@@ -1233,12 +1261,11 @@ def EXPERIMENTAL_CONDITIONALLY(x):
       'shards': 4,
     },
     'test': 'angle_deqp_gles2_tests',
-    # Only pass the display type to desktop. The Android runner doesn't support
-    # passing args to the executable but only one display type is supported on
-    # Android anyways.
+    'args': [
+      '--deqp-egl-display-type=angle-gles'
+    ],
     'desktop_args': [
       '--test-launcher-batch-limit=400',
-      '--deqp-egl-display-type=angle-gles'
     ],
     'android_args': [
       '--enable-xml-result-parsing',
@@ -1266,6 +1293,12 @@ def EXPERIMENTAL_CONDITIONALLY(x):
             'gpu': LINUX_QUADRO_P400_STABLE_DRIVER,
             'os': 'Ubuntu'
           },
+          {
+            'device_type': 'bullhead',
+            'device_os': 'O',
+            'os': 'Android',
+            'pool': 'Chrome-GPU',
+          },
         ],
       },
     ],
@@ -1281,9 +1314,15 @@ def EXPERIMENTAL_CONDITIONALLY(x):
     },
     'test': 'angle_deqp_gles2_tests',
     'args': [
-      '--test-launcher-batch-limit=400',
       '--deqp-egl-display-type=angle-vulkan'
-    ]
+    ],
+    'desktop_args': [
+      '--test-launcher-batch-limit=400',
+    ],
+    'android_args': [
+      '--enable-xml-result-parsing',
+      '--shard-timeout=500'
+    ],
   },
 
   'angle_deqp_gles3_gles_tests': {

diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
@@ -469,6 +469,16 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
     }
 
+    builders {
+      name: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
     builders {
       name: "Android FYI 32 Vk Release (Nexus 5X)"
       mixins: "android-gpu-fyi-ci"

diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
@@ -3192,19 +3192,29 @@ consoles {
     category: "Android|N64|NVDA"
     short_name: "STV"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Nexus 5X)"
+    category: "Android|vk|O32"
+    short_name: "N5X"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Nexus 5X)"
+    category: "Android|vk|O64"
+    short_name: "N5X"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Android FYI dEQP Release (Nexus 5X)"
     category: "Android|dqp|M64"
     short_name: "N5X"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Nexus 5X)"
-    category: "Android|vk|O32"
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Nexus 5X)"
+    category: "Android|dqp|vk|O32"
     short_name: "N5X"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Nexus 5X)"
-    category: "Android|vk|O64"
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Nexus 5X)"
+    category: "Android|dqp|vk|O64"
     short_name: "N5X"
   }
 }

diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
@@ -56,6 +56,8 @@ trigger {
   triggers: "Android arm64 Builder (dbg)"
   triggers: "Android ASAN (dbg)"
   triggers: "Android Cronet Builder"
+  triggers: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
+  triggers: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
   triggers: "Android FYI 32 Vk Release (Nexus 5X)"
   triggers: "Android FYI 64 Vk Release (Nexus 5X)"
   triggers: "Android FYI dEQP Release (Nexus 5X)"
@@ -183,6 +185,26 @@ job {
   }
 }
 
+job {
+  id: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
+  }
+}
+
+job {
+  id: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
+  }
+}
+
 job {
   id: "Android FYI 32 Vk Release (Nexus 5X)"
   acl_sets: "default"

diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json
@@ -90,6 +90,49 @@
       }
     ]
   },
+  "Android FYI 32 dEQP Vk Release (Nexus 5X)": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--deqp-egl-display-type=angle-vulkan",
+          "--enable-xml-result-parsing",
+          "--shard-timeout=500"
+        ],
+        "name": "angle_deqp_gles2_vulkan_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "O",
+              "device_type": "bullhead",
+              "os": "Android",
+              "pool": "Chrome-GPU"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "angle_deqp_gles2_tests",
+        "use_xvfb": false
+      }
+    ],
+    "isolated_scripts": []
+  },
   "Android FYI 64 Vk Release (Nexus 5X)": {
     "gtest_tests": [
       {
@@ -179,6 +222,49 @@
       }
     ]
   },
+  "Android FYI 64 dEQP Vk Release (Nexus 5X)": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--deqp-egl-display-type=angle-vulkan",
+          "--enable-xml-result-parsing",
+          "--shard-timeout=500"
+        ],
+        "name": "angle_deqp_gles2_vulkan_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "O",
+              "device_type": "bullhead",
+              "os": "Android",
+              "pool": "Chrome-GPU"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "angle_deqp_gles2_tests",
+        "use_xvfb": false
+      }
+    ],
+    "isolated_scripts": []
+  },
   "Android FYI Release (NVIDIA Shield TV)": {
     "gtest_tests": [
       {
@@ -2834,6 +2920,7 @@
     "gtest_tests": [
       {
         "args": [
+          "--deqp-egl-display-type=angle-gles",
           "--enable-xml-result-parsing",
           "--shard-timeout=500"
         ],
@@ -5029,8 +5116,8 @@
       },
       {
         "args": [
-          "--test-launcher-batch-limit=400",
-          "--deqp-egl-display-type=angle-vulkan"
+          "--deqp-egl-display-type=angle-vulkan",
+          "--test-launcher-batch-limit=400"
         ],
         "name": "angle_deqp_gles2_vulkan_tests",
         "swarming": {
@@ -15160,8 +15247,8 @@
       },
       {
         "args": [
-          "--test-launcher-batch-limit=400",
-          "--deqp-egl-display-type=angle-vulkan"
+          "--deqp-egl-display-type=angle-vulkan",
+          "--test-launcher-batch-limit=400"
         ],
         "name": "angle_deqp_gles2_vulkan_tests",
         "swarming": {
@@ -17679,8 +17766,8 @@
       },
       {
         "args": [
-          "--test-launcher-batch-limit=400",
-          "--deqp-egl-display-type=angle-vulkan"
+          "--deqp-egl-display-type=angle-vulkan",
+          "--test-launcher-batch-limit=400"
         ],
         "name": "angle_deqp_gles2_vulkan_tests",
         "swarming": {

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -288,6 +288,8 @@
       'Android FYI Release (NVIDIA Shield TV)': 'android_release_trybot_arm64',
       'Android FYI 32 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot',
       'Android FYI 64 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot_arm64',
+      'Android FYI 32 dEQP Vk Release (Nexus 5X)': 'deqp_android_vulkan_release_trybot',
+      'Android FYI 64 dEQP Vk Release (Nexus 5X)': 'deqp_android_vulkan_release_trybot_arm64',
       'GPU FYI Linux Builder': 'gpu_fyi_tests_release_trybot',
       'GPU FYI Linux Ozone Builder': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot',
       'GPU FYI Linux Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
@@ -1259,6 +1261,14 @@
       'angle_deqp_tests', 'android', 'release_trybot', 'arm64',
     ],
 
+    'deqp_android_vulkan_release_trybot': [
+      'angle_deqp_tests', 'android', 'vulkan', 'release_trybot',
+    ],
+
+    'deqp_android_vulkan_release_trybot_arm64': [
+      'angle_deqp_tests', 'android', 'vulkan', 'release_trybot', 'arm64',
+    ],
+
     'deqp_release_trybot_x86': [
       'angle_deqp_tests', 'release_trybot', 'x86',
     ],