diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml index f40fbad65995..863cf3a033c6 100644 --- a/taskcluster/ci/config.yml +++ b/taskcluster/ci/config.yml @@ -44,16 +44,12 @@ treeherder: 'M-fis': 'Mochitests with fission enabled' 'M-spi': 'Mochitests with socket process' 'M-spi-1proc': 'Mochitests with socket process without e10s' - 'M-sw': 'Mochitests with serviceworker redesign' - 'M-sw-1proc': 'Mochitests with serviceworker redesign without e10s' 'M-V-1proc': 'Mochitests on Valgrind without e10s' 'MSI': 'Repack installers into MSIs' 'MSIs': 'Signing of Repacked installers of MSIs' 'R': 'Reftests' 'R-1proc': 'Reftests without e10s' 'R-fis': 'Reftests with fission enabled' - 'R-sw': 'Reftests with serviceworker redesign' - 'R-sw-1proc': 'Reftests with serviceworker redesign enabled without e10s' 'Rap': 'Raptor performance tests on Firefox' 'Rap-1proc': 'Raptor performance tests on Firefox without e10s' 'Rap-fis': 'Raptor performance tests on Firefox with fission enabled' @@ -85,13 +81,9 @@ treeherder: 'W': 'Web platform tests' 'W-1proc': 'Web platform tests without e10s' 'W-fis': 'Web platform tests with fission enabled' - 'W-sw': 'Web platform tests with serviceworker redesign' - 'W-sw-1proc': 'Web platform tests with serviceworker redesign, without e10s' 'X': 'Xpcshell tests' 'X-1proc': 'Xpcshell tests, without e10s' 'X-fis': 'Xpcshell tests with fission enabled' - 'X-sw': 'Xpcshell tests with serviceworker redesign' - 'X-sw-1proc': 'Xpcshell tests with serviceworker redesign, without e10s' 'L10n': 'Localised Repacks' 'L10n-Rpk': 'Localized Repackaged Repacks' 'BM': 'Beetmover' diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml index a9ee4f508dcb..39893ad2a62b 100644 --- a/taskcluster/ci/test/mochitest.yml +++ b/taskcluster/ci/test/mochitest.yml @@ -12,7 +12,7 @@ job-defaults: default: null variants: by-test-platform: - linux.*64/debug: ['fission', 'serviceworker'] + linux.*64/debug: ['fission'] default: ['fission'] run-on-projects: by-test-platform: @@ -268,7 +268,7 @@ mochitest-media: variants: by-test-platform: android.*: ['socketprocess'] - linux1804-64/debug: ['fission', 'serviceworker', 'socketprocess'] + linux1804-64/debug: ['fission', 'socketprocess'] default: ['fission', 'socketprocess'] loopback-video: true instance-size: large diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml index a92cb3145bc3..6fc196fbc480 100644 --- a/taskcluster/ci/test/reftest.yml +++ b/taskcluster/ci/test/reftest.yml @@ -12,7 +12,7 @@ job-defaults: default: null variants: by-test-platform: - linux1804-64/debug: ['fission', 'serviceworker'] + linux1804-64/debug: ['fission'] default: ['fission'] fission-tier: 2 run-on-projects: diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml index c0039d123eef..77566e4028c4 100644 --- a/taskcluster/ci/test/web-platform.yml +++ b/taskcluster/ci/test/web-platform.yml @@ -12,7 +12,7 @@ job-defaults: default: 5400 variants: by-test-platform: - linux.*64/debug: ['fission', 'serviceworker'] + linux.*64/debug: ['fission'] default: ['fission'] fission-run-on-projects: by-test-platform: diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml index 6e25a58083b6..57f79ea17579 100644 --- a/taskcluster/ci/test/xpcshell.yml +++ b/taskcluster/ci/test/xpcshell.yml @@ -6,7 +6,7 @@ job-defaults: suite: xpcshell variants: by-test-platform: - linux1804-64/debug: ['fission', 'serviceworker'] + linux1804-64/debug: ['fission'] default: ['fission'] target: by-test-platform: diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index ac763a539948..2b5b4b448550 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -171,20 +171,6 @@ TEST_VARIANTS = { }, }, }, - 'serviceworker': { - 'description': "{description} with serviceworker-e10s redesign enabled", - 'filterfn': runs_on_central, - 'suffix': 'sw', - 'replace': { - 'run-on-projects': ['mozilla-central'], - }, - 'merge': { - 'tier': 2, - 'mozharness': { - 'extra-options': ['--setpref="dom.serviceWorkers.parent_intercept=true"'], - }, - }, - }, 'socketprocess': { 'description': "{description} with socket process enabled", 'suffix': 'spi', diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py index 31786f9caba3..4f11a7fa31d6 100644 --- a/testing/mochitest/runtests.py +++ b/testing/mochitest/runtests.py @@ -2573,11 +2573,6 @@ toolbar#nav-bar { # (https://bugzilla.mozilla.org/show_bug.cgi?id=1577912) this value # should by synchronized with the default pref value indicated in # StaticPrefList.yaml. - # - # Currently for automation, the pref defaults to true (but can be - # overridden with --setpref). - "serviceworker_e10s": self.extraPrefs.get( - 'dom.serviceWorkers.parent_intercept', True), "socketprocess_e10s": self.extraPrefs.get( 'network.process.enabled', False), @@ -2827,8 +2822,6 @@ toolbar#nav-bar { self.log.info("runtests.py | Running with e10s: {}".format(options.e10s)) self.log.info("runtests.py | Running with fission: {}".format( mozinfo.info.get('fission', False))) - self.log.info("runtests.py | Running with serviceworker_e10s: {}".format( - mozinfo.info.get('serviceworker_e10s', False))) self.log.info("runtests.py | Running with socketprocess_e10s: {}".format( mozinfo.info.get('socketprocess_e10s', False))) self.log.info("runtests.py | Running tests: start.\n")