Backed out 2 changesets (bug 1713312). r=me

Backed out changeset 25979118e932 (bug 1713312)
Backed out changeset ff95d0a57315 (bug 1713312)

The once-daily jobs did not actually run with the daily cron as expected.

taskcluster/ci/build/kind.yml

@@ -21,6 +21,9 @@ jobs-from:
     - windows.yml
 
 job-defaults:
+    optimization:
+        skip-suite-only: null
+
     run:
         mozconfig-variant:
             by-release-type:

taskcluster/ci/build/linux.yml

@@ -27,8 +27,6 @@ linux64/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -75,8 +73,6 @@ linux64-shippable/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
     run-on-projects: ['release']
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -117,8 +113,6 @@ linux64/debug:
         mozconfig-variant: debug
         need-xvfb: true
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -164,8 +158,6 @@ linux64-asan/opt:
         need-xvfb: true
     run-on-projects: ['release']
     use-sccache: true
-    optimization:
-        skip-unless-daily-no-suite: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -213,8 +205,6 @@ linux64-aarch64/opt:
         need-xvfb: true
     run-on-projects: ['comm-central']
     use-sccache: true
-    optimization:
-        skip-unless-daily-no-suite: null
     fetches:
         toolchain:
             - linux-aarch64-libotr
@@ -251,8 +241,6 @@ linux/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -300,8 +288,6 @@ linux-shippable/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
     run-on-projects: ['release']
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -341,8 +327,6 @@ linux/debug:
         mozconfig-variant: debug
         need-xvfb: true
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils

taskcluster/ci/build/macosx.yml

@@ -15,8 +15,6 @@ job-defaults:
         config-paths:
             - comm/testing/mozharness/configs
         script: "mozharness/scripts/fx_desktop_build.py"
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils

taskcluster/ci/build/windows.yml

@@ -49,8 +49,6 @@ win32/opt:
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
                 LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -109,8 +107,6 @@ win32-shippable/opt:
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
                 LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     run-on-projects: ['release']
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -164,8 +160,6 @@ win32/debug:
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
                 LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -219,8 +213,6 @@ win64/opt:
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
                 LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -279,8 +271,6 @@ win64-shippable/opt:
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
                 LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     run-on-projects: ['release']
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -334,8 +324,6 @@ win64/debug:
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
                 LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     use-sccache: true
-    optimization:
-        skip-suite-only: null
     fetches:
         toolchain:
             - linux64-binutils
@@ -384,8 +372,6 @@ win64-plain/debug:
             stage_platform: win64
         mozconfig-variant: plain-debug
     run-on-projects: ['comm-central']
-    optimization:
-        skip-unless-daily-no-suite: null
     fetches:
         toolchain:
             - win64-cbindgen
@@ -425,8 +411,6 @@ win64-plain/opt:
             stage_platform: win64
         mozconfig-variant: plain-opt
     run-on-projects: ['comm-central']
-    optimization:
-        skip-unless-daily-no-suite: null
     fetches:
         toolchain:
             - win64-cbindgen
@@ -471,8 +455,6 @@ win64-asan/opt:
         mozconfig-variant: nightly-asan
     run-on-projects: ['release']
     use-sccache: true
-    optimization:
-        skip-unless-daily-no-suite: null
     fetches:
         toolchain:
             - linux64-binutils

taskcluster/comm_taskgraph/optimize.py

@@ -70,30 +70,9 @@ register_strategy(
     "skip-unless-changed-no-suite", args=("skip-unless-changed", "skip-suite-only")
 )(Any)
 
-
-@register_strategy("skip-unless-daily")
-class SkipUnlessDaily(OptimizationStrategy):
-    def should_remove_task(self, task, params, arg):
-        # Only optimize comm-central
-        if params["project"] != "comm-central":
-            return False
-
-        # If running a "Daily" taskgraph, run this task
-        if params["target_tasks_method"] == "nightly_desktop":
-            return False
-
-        return True
-
-
-register_strategy(
-    "skip-unless-daily-no-suite", args=("skip-unless-daily", "skip-suite-only")
-)(Any)
-
 optimizations = (
     {"skip-suite-only": None},
     {"skip-unless-changed-no-suite": [text_type]},
-    {"skip-unless-daily": None},
-    {"skip-unless-daily-no-suite": None},
 )
 
 thunderbird_optimizations = default_optimizations + optimizations

taskcluster/comm_taskgraph/test/test_optimization_strategies.py

@@ -144,28 +144,5 @@ def test_suite_files_changed_strategy(params, file_patterns, pushed_files, expec
     assert remove == expected
 
 
-@pytest.mark.parametrize(
-    "project,target_tasks_method,expected",
-    [
-        # comm-central, run on push
-        pytest.param("comm-central", "default", True),
-        # comm-central, daily build
-        pytest.param("comm-central", "nightly_desktop", False),
-        # comm-beta, run on push (mozilla_beta_tasks)
-        pytest.param("comm-beta", "mozilla_beta_tasks", False),
-    ],
-    ids=idfn,
-)
-def test_skip_unless_daily_strategy(params, project, target_tasks_method, expected):
-    params["project"] = project
-    params["target_tasks_method"] = target_tasks_method
-    task = generate_task()
-
-    opt = registry["skip-unless-daily"]
-    remove = opt.should_remove_task(task, params, None)
-
-    assert remove == expected
-
-
 if __name__ == "__main__":
     main()