Skip to content

Do not apply skip-unless-changed for cron triggers. #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahal merged 3 commits into from
Nov 18, 2024
Merged

Do not apply skip-unless-changed for cron triggers. #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fbdc1f
Do not apply skip-unless-changed for cron triggers.
afranchuk Nov 1, 2024
f2f4fa2
style: pre-commit.ci auto fixes [...]
pre-commit-ci[bot] Nov 4, 2024
0c47206
Apply head/base comparison only when base is non-empty (i.e., there are
afranchuk Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions docs/reference/optimization-strategies.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@ Strategies for Removing Tasks
skip-unless-changed
~~~~~~~~~~~~~~~~~~~

.. note::

This strategy is only implemented for Mercurial repositories hosted on
``hg.mozilla.org``.

The :class:`skip-unless-changed
<taskgraph.optimize.strategies.SkipUnlessChanged>` strategy will optimize the
target task away *unless* a specified file is modified. Glob patterns are
supported.
target task away *unless* a specified file is modified. When there is no
difference between head and base revs (for example, cron or action tasks), this
optimization will not apply. Glob patterns are supported.

Example:

Expand Down
5 changes: 3 additions & 2 deletions src/taskgraph/optimize/strategies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ def check(self, files_changed, patterns):
return False

def should_remove_task(self, task, params, file_patterns):
# pushlog_id == -1 - this is the case when run from a cron.yml job or on a git repository
if params.get("repository_type") == "hg" and params.get("pushlog_id") == -1:
# skip-unless-changed should not apply when there is no commit delta,
# such as for cron and action tasks (there will never be file changes)
if params.get("base_rev") and params.get("head_rev") == params.get("base_rev"):
return False

changed = self.check(params["files_changed"], file_patterns)
Expand Down
6 changes: 5 additions & 1 deletion test/test_optimize_strategies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,11 @@ def test_index_search(caplog, responses, params, state, expires, expected, logs)
{"files_changed": ["bar.txt"]}, ["foo.txt"], True, id="files don't match"
),
pytest.param(
{"repository_type": "hg", "pushlog_id": -1, "files_changed": ["bar.txt"]},
{
"head_rev": "8843d7f92416211de9ebb963ff4ce28125932878",
"base_rev": "8843d7f92416211de9ebb963ff4ce28125932878",
"files_changed": ["bar.txt"],
},
["foo.txt"],
False,
id="cron task",
Expand Down