From e17e27fe73309578cb47d84b68484f6fa4ce6b1e Mon Sep 17 00:00:00 2001
From: Aki Sasaki <aki@escapewindow.com>
Date: Fri, 22 Sep 2017 17:10:22 -0700
Subject: [PATCH] 5.2.0

---
 CHANGELOG.md            | 21 +++++++++++++++++++++
 scriptworker/version.py |  2 +-
 version.json            | 10 +++++-----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0071e071..df14414c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.2.0] - 2017-10-03
+### Added
+- `scriptworker.task.get_parent_task_id` to support the new `task.extra.parent` breadcrumb.
+- `scriptworker.cot.verify.ACTION_MACH_COMMANDS` and `cot.verify.PARENT_TASK_TYPES` to separate action task verification from decision task verification.
+- `scriptworker.cot.verify.ChainOfTrust.parent_task_id` to find the `parent_task_id` later.
+- `scriptworker.cot.verify.LinkOfTrust.parent_task_id` to find the `parent_task_id` later.
+- added a new `action` task type. This uses the same sha allowlist as the `decision` task type.
+- `scriptworker.cot.verify.is_action`, since differentiating between a decision task and an action task requires some task definition introspection.
+- `verify_firefox_decision_command` now takes a `mach_commands` kwarg; for action tasks, we set this to `ACTION_MACH_COMMANDS`
+- `verify_action_task` verifies the action task command.
+- `verify_parent_task` runs the checks previously in `verify_decision_task`; we run this for both action and decision tasks.
+
+### Changed
+- `find_sorted_task_dependencies` now uses the `parent_task_id` rather than the `decision_task_id` for its `parent_tuple`.
+- `download_firefox_cot_artifacts` now downloads `task-graph.json` from action tasks as well as decision tasks
+- `verify_decision_task` now only checks the command. The other checks have been moved to `verify_parent_task`.
+- decision tasks now run `verify_parent_task`.
+
+### Fixed
+- Updated `README.md` to specify `tox` rather than `python setup.py test`
+
 ## [5.1.5] - 2017-10-02
 ### Added
 - added maple to the list of privileged branches.
diff --git a/scriptworker/version.py b/scriptworker/version.py
index 667e974c..d042bf0e 100755
--- a/scriptworker/version.py
+++ b/scriptworker/version.py
@@ -52,7 +52,7 @@ def get_version_string(version):
 
 # 1}}}
 # Semantic versioning 2.0.0  http://semver.org/
-__version__ = (5, 1, 5)
+__version__ = (5, 2, 0)
 __version_string__ = get_version_string(__version__)
 
 
diff --git a/version.json b/version.json
index 0b7926cf..b93d04e9 100644
--- a/version.json
+++ b/version.json
@@ -1,8 +1,8 @@
 {
     "version": [
-        5, 
-        1, 
-        5
-    ], 
-    "version_string": "5.1.5"
+        5,
+        2,
+        0
+    ],
+    "version_string": "5.2.0"
 }
\ No newline at end of file