summaryrefslogtreecommitdiffstats
path: root/jjb/octopus/octopus.yml
diff options
context:
space:
mode:
authorVictor Laza <vlaza@cloudbasesolutions.com>2015-05-11 11:41:40 +0300
committerVictor Laza <vlaza@cloudbasesolutions.com>2015-05-11 11:41:40 +0300
commit2d0073284a0f111bae2ebf8401d482b29f5c9c81 (patch)
tree6f3aab9f69b068e239e286cfacac9bb79118b193 /jjb/octopus/octopus.yml
parentaffb0a0384b1029a4448d2b9b5e0566fec0f3029 (diff)
Fixed missing "node: master" in octopus merge job
JIRA: OCTO-66 - Fixed missing "node: master" in octopus merge job Change-Id: I0bb9466ecb3e50920bdd1764a328b67ea771733e Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
Diffstat (limited to 'jjb/octopus/octopus.yml')
-rw-r--r--jjb/octopus/octopus.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 459ba7a01..47563d6b9 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -133,6 +133,8 @@
- job-template:
name: 'octopus-merge'
+ node: master
+
# builder-merge job to run JJB update
#
# This job's purpose is to update all the JJB