From 365c860dc79d3bbdc062aab0f351b2f73cd52702 Mon Sep 17 00:00:00 2001 From: W Chan Date: Tue, 7 Apr 2020 22:49:02 +0000 Subject: [PATCH 1/3] Update orquesta to version that has the syntax fix for with items task Update orquesta to the commit version with the fix that enforces with items task to have action defined and throw exception if action is misindented. --- CHANGELOG.rst | 1 + contrib/runners/orquesta_runner/in-requirements.txt | 2 +- contrib/runners/orquesta_runner/requirements.txt | 2 +- requirements.txt | 2 +- st2common/in-requirements.txt | 2 +- st2common/requirements.txt | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d89577336a..369c30cb16 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -117,6 +117,7 @@ Fixed Contributed by Tatsuma Matsuki (@mtatsuma) * Fix dependency conflicts by updating ``requests`` (2.23.0) and ``gitpython`` (2.1.15). #4869 +* Fix orquesta syntax error for with items task where action is misindented or missing. (bug fix) Removed ~~~~~~~ diff --git a/contrib/runners/orquesta_runner/in-requirements.txt b/contrib/runners/orquesta_runner/in-requirements.txt index 6b6baa1a08..6957006c1e 100644 --- a/contrib/runners/orquesta_runner/in-requirements.txt +++ b/contrib/runners/orquesta_runner/in-requirements.txt @@ -1 +1 @@ -git+https://github.com/StackStorm/orquesta.git@359a33f3d51c82f0177b175998ecd99214f992e8#egg=orquesta +git+https://github.com/StackStorm/orquesta.git@419a4a94fc387a274b7873e04de0cc3e00d6cc5d#egg=orquesta diff --git a/contrib/runners/orquesta_runner/requirements.txt b/contrib/runners/orquesta_runner/requirements.txt index 058d3c701b..88b1107e17 100644 --- a/contrib/runners/orquesta_runner/requirements.txt +++ b/contrib/runners/orquesta_runner/requirements.txt @@ -5,4 +5,4 @@ # If you want to update depdencies for a single component, modify the # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt -git+https://github.com/StackStorm/orquesta.git@359a33f3d51c82f0177b175998ecd99214f992e8#egg=orquesta +git+https://github.com/StackStorm/orquesta.git@419a4a94fc387a274b7873e04de0cc3e00d6cc5d#egg=orquesta diff --git a/requirements.txt b/requirements.txt index 04f73d6198..65080afc6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ cryptography==2.8 eventlet==0.25.1 flex==6.14.0 git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper -git+https://github.com/StackStorm/orquesta.git@359a33f3d51c82f0177b175998ecd99214f992e8#egg=orquesta +git+https://github.com/StackStorm/orquesta.git@419a4a94fc387a274b7873e04de0cc3e00d6cc5d#egg=orquesta git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file gitpython==2.1.15 diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index 80f27e9de6..69726697a1 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -9,7 +9,7 @@ jsonschema kombu mongoengine networkx -git+https://github.com/StackStorm/orquesta.git@359a33f3d51c82f0177b175998ecd99214f992e8#egg=orquesta +git+https://github.com/StackStorm/orquesta.git@419a4a94fc387a274b7873e04de0cc3e00d6cc5d#egg=orquesta oslo.config paramiko pyyaml diff --git a/st2common/requirements.txt b/st2common/requirements.txt index aa89981a7f..848133a82b 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -10,7 +10,7 @@ apscheduler==3.6.3 cryptography==2.8 eventlet==0.25.1 flex==6.14.0 -git+https://github.com/StackStorm/orquesta.git@359a33f3d51c82f0177b175998ecd99214f992e8#egg=orquesta +git+https://github.com/StackStorm/orquesta.git@419a4a94fc387a274b7873e04de0cc3e00d6cc5d#egg=orquesta gitpython==2.1.15 greenlet==0.4.15 ipaddr From f18e49eb3f3150ce9eb4154d4bffa171dafb2dc4 Mon Sep 17 00:00:00 2001 From: W Chan Date: Tue, 7 Apr 2020 23:41:33 +0000 Subject: [PATCH 2/3] Add PR to the changelog entry --- CHANGELOG.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 369c30cb16..be4726adcd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -117,7 +117,8 @@ Fixed Contributed by Tatsuma Matsuki (@mtatsuma) * Fix dependency conflicts by updating ``requests`` (2.23.0) and ``gitpython`` (2.1.15). #4869 -* Fix orquesta syntax error for with items task where action is misindented or missing. (bug fix) +* Fix orquesta syntax error for with items task where action is misindented or missing. + PR @ https://github.com/StackStorm/orquesta/pull/195 (bug fix) Removed ~~~~~~~ From f720cda7d56b562b9367d6fba6b4ba1904a3dcad Mon Sep 17 00:00:00 2001 From: W Chan Date: Wed, 8 Apr 2020 00:26:25 +0000 Subject: [PATCH 3/3] Minor change to PR reference in the changelog entry --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index be4726adcd..4f3c9cc863 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -118,7 +118,7 @@ Fixed * Fix dependency conflicts by updating ``requests`` (2.23.0) and ``gitpython`` (2.1.15). #4869 * Fix orquesta syntax error for with items task where action is misindented or missing. - PR @ https://github.com/StackStorm/orquesta/pull/195 (bug fix) + StackStorm/orquesta#195 (bug fix) Removed ~~~~~~~