summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2015-07-31 20:51:08 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-07-31 20:51:08 +0000
commita5d5b6ef96411f8c91e3e3b7d96f303bd52755ae (patch)
tree952da17979e9d7c83c95c8f0c7b0a50a8a0e5ce9
parent6c9f2202e0aaad59d80aa43f62e169009f8a8a2d (diff)
parent2cc58f305e99235f4da7688fa476636529c6d861 (diff)
Merge "create merge job for genesis master and stable/arno"
-rw-r--r--jjb/genesis/genesis-foreman.yml8
-rw-r--r--jjb/genesis/genesis-fuel.yml8
2 files changed, 8 insertions, 8 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 5c6be56b3..3bc6b125a 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -11,7 +11,7 @@
jobs:
- 'genesis-foreman-verify-{stream}'
- - 'genesis-foreman-merge'
+ - 'genesis-foreman-merge-{stream}'
- 'genesis-foreman-daily-{stream}'
- 'genesis-foreman-build-{stream}'
- 'genesis-foreman-deploy-{stream}'
@@ -97,7 +97,7 @@
- 'foreman-workspace-cleanup'
- job-template:
- name: 'genesis-foreman-merge'
+ name: 'genesis-foreman-merge-{stream}'
project-type: freestyle
@@ -120,7 +120,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- foreman-parameter:
installer: '{installer}'
gs-pathname: ''
@@ -145,7 +145,7 @@
project-pattern: 'genesis'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
pattern: 'common/**'
diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index b4b428b19..f6b2d0b7e 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -11,7 +11,7 @@
jobs:
- 'genesis-fuel-verify-{stream}'
- - 'genesis-fuel-merge'
+ - 'genesis-fuel-merge-{stream}'
- 'genesis-fuel-daily-{stream}'
- 'genesis-fuel-build-{stream}'
- 'genesis-fuel-deploy-{stream}'
@@ -99,7 +99,7 @@
- 'fuel-workspace-cleanup'
- job-template:
- name: 'genesis-fuel-merge'
+ name: 'genesis-fuel-merge-{stream}'
project-type: freestyle
@@ -122,7 +122,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- fuel-parameter:
installer: '{installer}'
gs-pathname: ''
@@ -148,7 +148,7 @@
project-pattern: 'genesis'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
pattern: 'common/**'