Add: Job filter as a context variable

docs/en/manual/04-jobs.md

@@ -1654,6 +1654,7 @@ Job context variables:
 * `job.retryAttempt`: A number indicating the attempt, if this execution is a [retry](#retry).
 * `job.wasRetry`: `true` if this execution is a retry, otherwise `false`. See: [retry](#retry).
 * `job.threadcount`: Threadcount (number of nodes run at once) of the Job
+* `job.filter`: The filter used to select the nodes for this job (if applicable)
 
 Node context variables:
 

rundeckapp/grails-app/assets/javascripts/jobedit.js

@@ -93,9 +93,10 @@ function _jobVarData() {
             'user.email': {title: 'Email of user executing the job'},
             'retryAttempt': {title: 'Retry attempt number'},
             'wasRetry': {title: 'True if execution is a retry'},
-            'threadcount': {title: 'Job Threadcount'}
+            'threadcount': {title: 'Job Threadcount'},
+            'filter': {title: 'Job Node Filter Query'}
         };
-        ['id', 'execid', 'name', 'group', 'username', 'project', 'loglevel', 'user.email', 'retryAttempt', 'wasRetry', 'threadcount'].each(function (e) {
+        ['id', 'execid', 'name', 'group', 'username', 'project', 'loglevel', 'user.email', 'retryAttempt', 'wasRetry', 'threadcount', 'filter'].each(function (e) {
             _VAR_DATA['job'].push({key: 'job.' + e, category: 'Job', title: jobdata[e].title, desc: jobdata[e].desc});
         });
     }

rundeckapp/grails-app/services/rundeck/services/ExecutionService.groovy

@@ -898,6 +898,9 @@ class ExecutionService implements ApplicationContextAware, StepExecutor, NodeSte
             jobcontext.id = execution.scheduledExecution.extid
             jobcontext.successOnEmptyNodeFilter=execution.scheduledExecution.successOnEmptyNodeFilter?"true":"false"
         }
+        if (execution.filter) {
+            jobcontext.filter = execution.filter
+        }
         jobcontext.execid = execution.id.toString()
         jobcontext.executionType = execution.executionType
         jobcontext.serverUrl = generateServerURL(grailsLinkGenerator)

rundeckapp/test/unit/ExecutionServiceTests.groovy

@@ -2092,4 +2092,28 @@ class ExecutionServiceTests  {
         assertNotNull(execs)
         assertTrue(execs.contains(e2))
     }
+
+    void testExportContextForExectuion(){
+        def filterFixture = "foo bar"
+
+        def ex = new Execution(
+                project: "test",
+                user: "test",
+                workflow: new Workflow(
+                        commands: [
+                                new CommandExec(adhocRemoteString: "exec")
+                        ]
+                ),
+                filter: filterFixture
+        )
+
+        def lg = mockFor(org.codehaus.groovy.grails.web.mapping.LinkGenerator)
+        lg.demand.link(2..2) { return '' }
+
+        def jobcontext = ExecutionService.exportContextForExecution(ex, lg.createMock())
+
+        assertEquals(filterFixture, jobcontext.filter)
+
+        lg.verify()
+    }
 }