From 8c069808bb64ee2857d44d521afc47213fff492a Mon Sep 17 00:00:00 2001
From: Andrew Osmond <aosmond@mozilla.com>
Date: Wed, 24 Feb 2021 18:47:25 +0000
Subject: [PATCH] Bug 1693383 - Part 4. Add jobs for Linux Software WebRender
 mochitests. r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D105665
---
 taskcluster/ci/config.yml         |  4 ++++
 taskcluster/ci/test/mochitest.yml | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 89e31b3b7239..5982f87c74a7 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -65,6 +65,8 @@ treeherder:
         'M-spi-1proc': 'Mochitests with socket process without e10s'
         'M-spi-nw': 'Mochitests with networking on socket process'
         'M-spi-nw-1proc': 'Mochitests with networking on socket process without e10s'
+        'M-swr': 'Mochitests with software webrender enabled'
+        'M-swr-1proc': 'Mochitests with software webrender enabled without e10s'
         'M-f': 'Mochitest failures'
         'M-f-1proc': 'Mochitest failures without e10s'
         'M-f-fis': 'Mochitest failures with fission enabled'
@@ -74,6 +76,8 @@ treeherder:
         'M-f-spi-1proc': 'Mochitest failures with socket process without e10s'
         'M-f-spi-nw': 'Mochitest failures with networking on socket process'
         'M-f-spi-nw-1proc': 'Mochitest failures with networking on socket process without e10s'
+        'M-f-swr': 'Mochitests failures with software webrender enabled'
+        'M-f-swr-1proc': 'Mochitests failures with software webrender enabled without e10s'
         'M-V-1proc': 'Mochitests on Valgrind without e10s'
         'MSI': 'Repack installers into MSIs'
         'MSIs': 'Signing of Repacked installers of MSIs'
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index a6e013bf6b7b..1f8eb5b07210 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -13,6 +13,7 @@ job-defaults:
     variants:
         by-test-platform:
             linux.*64/debug: ['fission']
+            linux.*64-qr/debug: ['webrender-sw', 'fission']
             default: ['fission']
     run-on-projects:
         by-test-platform:
@@ -66,6 +67,7 @@ mochitest-plain:
         by-test-platform:
             linux1804-64/opt: ['fission-xorigin']
             linux1804-64/debug: ['fission-xorigin']
+            linux1804-64-qr/debug: ['webrender-sw', 'fission']
             default: ['fission']
     chunks:
         by-test-platform:
@@ -118,6 +120,7 @@ mochitest-browser-chrome:
     variants:
         by-test-platform:
             linux.*64(-shippable)?/opt: ['fission', 'a11y-checks']
+            linux.*64-qr/debug: ['webrender-sw', 'fission']
             default: ['fission']
     fission-run-on-projects:
         by-test-platform:
@@ -238,6 +241,7 @@ mochitest-devtools-chrome:
     variants:
         by-test-platform:
             linux.*64(-shippable)?/opt: ['fission', 'a11y-checks']
+            linux.*64-qr/debug: ['webrender-sw', 'fission']
             default: ['fission']
     fission-run-on-projects:
         by-test-platform:
@@ -361,6 +365,7 @@ mochitest-media:
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: ['socketprocess']
+            linux.*64-qr/debug: ['webrender-sw', 'fission']
             default: ['fission', 'socketprocess', 'webgl-ipc']
     loopback-video: true
     instance-size:
@@ -466,6 +471,7 @@ mochitest-webgl1-core:
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: []
+            linux.*64-qr/debug: ['webrender-sw', 'webgl-ipc']
             default: ['webgl-ipc']
     e10s: true
     test-manifest-loader: null  # don't load tests in the taskgraph
@@ -497,6 +503,7 @@ mochitest-webgl1-ext:
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: []
+            linux.*64-qr/debug: ['webrender-sw', 'webgl-ipc']
             default: ['webgl-ipc']
     chunks:
         by-test-platform:
@@ -530,6 +537,7 @@ mochitest-webgl2-core:
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: []
+            linux.*64-qr/debug: ['webrender-sw', 'webgl-ipc']
             default: ['webgl-ipc']
     chunks:
         by-test-platform:
@@ -561,6 +569,7 @@ mochitest-webgl2-ext:
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: []
+            linux.*64-qr/debug: ['webrender-sw', 'webgl-ipc']
             default: ['webgl-ipc']
     chunks: 4
     e10s: true
@@ -586,6 +595,7 @@ mochitest-webgl2-deqp:
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: []
+            linux.*64-qr/debug: ['webrender-sw', 'webgl-ipc']
             default: ['webgl-ipc']
     chunks: 4
     e10s: true