Merge pull request #4572 from StackStorm/fix-orquesta-join-ctx

Minor bug fix to orquesta for overwritten context on task join

CHANGELOG.rst

@@ -31,6 +31,8 @@ Fixed
   (improvement) StackStorm/orquesta#122.
 * Fix orquesta workflow stuck in running status when one or more items failed execution for a
   with items task. (bug fix) #4523
+* Fix orquesta workflow bug where context variables are being overwritten on task join.
+  (bug fix) StackStorm/orquesta#112
 
 2.10.2 - February 21, 2019
 --------------------------

contrib/examples/actions/workflows/orquesta-join.yaml

@@ -3,14 +3,8 @@ version: 1.0
 description: A basic workflow that demonstrate branching and join.
 
 vars:
-  - messages: null
-
-output:
-  - messages:
-     - <% ctx().msg1 %>
-     - <% ctx().msg2 %>
-     - <% ctx().msg3 %>
-     - <% ctx().msg4 %>
+  - msg1: foobar
+  - msg2: fubar
 
 tasks:
   task1:
@@ -73,8 +67,14 @@ tasks:
         publish: msg4="I'll grind his bones to make my bread"
         do: task10
 
-
   # converge branches
   task10:
     join: all
     action: core.noop
+
+output:
+  - messages:
+     - <% ctx().msg1 %>
+     - <% ctx().msg2 %>
+     - <% ctx().msg3 %>
+     - <% ctx().msg4 %>

contrib/runners/orquesta_runner/in-requirements.txt

@@ -1 +1 @@
-git+https://github.com/StackStorm/orquesta.git@5151f38877ac7d05d0576c183900f780a7556539#egg=orquesta
+git+https://github.com/StackStorm/orquesta.git@d038caf217cf63bca2364905160bab7655f81d99#egg=orquesta

contrib/runners/orquesta_runner/requirements.txt

@@ -1,2 +1,2 @@
 # Don't edit this file. It's generated automatically!
-git+https://github.com/StackStorm/orquesta.git@5151f38877ac7d05d0576c183900f780a7556539#egg=orquesta
+git+https://github.com/StackStorm/orquesta.git@d038caf217cf63bca2364905160bab7655f81d99#egg=orquesta

requirements.txt

@@ -8,7 +8,7 @@ cryptography==2.4.2
 eventlet==0.24.1
 flex==6.14.0
 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
-git+https://github.com/StackStorm/orquesta.git@5151f38877ac7d05d0576c183900f780a7556539#egg=orquesta
+git+https://github.com/StackStorm/orquesta.git@d038caf217cf63bca2364905160bab7655f81d99#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.11

st2common/in-requirements.txt

@@ -9,7 +9,7 @@ jsonschema
 kombu
 mongoengine
 networkx
-git+https://github.com/StackStorm/orquesta.git@5151f38877ac7d05d0576c183900f780a7556539#egg=orquesta
+git+https://github.com/StackStorm/orquesta.git@d038caf217cf63bca2364905160bab7655f81d99#egg=orquesta
 oslo.config
 paramiko
 pyyaml

st2common/requirements.txt

@@ -4,7 +4,7 @@ apscheduler==3.5.3
 cryptography==2.4.2
 eventlet==0.24.1
 flex==6.14.0
-git+https://github.com/StackStorm/orquesta.git@5151f38877ac7d05d0576c183900f780a7556539#egg=orquesta
+git+https://github.com/StackStorm/orquesta.git@d038caf217cf63bca2364905160bab7655f81d99#egg=orquesta
 greenlet==0.4.15
 ipaddr
 jinja2

st2common/st2common/services/workflows.py

@@ -258,7 +258,7 @@ def request(wf_def, ac_ex_db, st2_ctx, notify_cfg=None):
     # Publish the workflow execution requested state to the message bus.
     if wf_ex_db.status not in states.COMPLETED_STATES:
         wf_ex_db.context['st2']['workflow_execution_id'] = str(wf_ex_db.id)
-        wf_ex_db.flow['contexts'][0]['value']['st2']['workflow_execution_id'] = str(wf_ex_db.id)
+        wf_ex_db.flow['contexts'][0]['st2']['workflow_execution_id'] = str(wf_ex_db.id)
         wf_ex_db = wf_db_access.WorkflowExecution.update(wf_ex_db, publish=False)
         wf_db_access.WorkflowExecution.publish_status(wf_ex_db)
         msg = '[%s] Workflow execution "%s" is published.'