Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix RabbitMQ service installation in Yardstick jobs"
[releng.git]
/
jjb
/
releng
/
opnfv-docker.yml
diff --git
a/jjb/releng/opnfv-docker.yml
b/jjb/releng/opnfv-docker.yml
index
355cb5d
..
630a7ea
100644
(file)
--- a/
jjb/releng/opnfv-docker.yml
+++ b/
jjb/releng/opnfv-docker.yml
@@
-19,6
+19,10
@@
stream: euphrates
branch: 'stable/{stream}'
disabled: false
stream: euphrates
branch: 'stable/{stream}'
disabled: false
+ fraser: &fraser
+ stream: fraser
+ branch: 'stable/{stream}'
+ disabled: false
storperf-receivers: &storperf-receivers
receivers: >
mark.beierl@emc.com
storperf-receivers: &storperf-receivers
receivers: >
mark.beierl@emc.com
@@
-39,34
+43,34
@@
project: 'releng-anteater'
<<: *master
<<: *other-receivers
project: 'releng-anteater'
<<: *master
<<: *other-receivers
- - 'barometer':
+ - 'barometer
-collectd
':
project: 'barometer'
project: 'barometer'
- dockerdir: '.'
- dockerfile: 'docker/Dockerfile'
+ dockerdir: 'docker/barometer-collectd'
<<: *master
<<: *other-receivers
- 'barometer-grafana':
project: 'barometer'
<<: *master
<<: *other-receivers
- 'barometer-grafana':
project: 'barometer'
- dockerdir: '.'
- dockerfile: 'docker/barometer-grafana/Dockerfile'
+ dockerdir: 'docker/barometer-grafana'
<<: *master
<<: *other-receivers
- 'barometer-influxdb':
project: 'barometer'
<<: *master
<<: *other-receivers
- 'barometer-influxdb':
project: 'barometer'
- dockerdir: '.'
- dockerfile: 'docker/barometer-influxdb/Dockerfile'
+ dockerdir: 'docker/barometer-influxdb'
<<: *master
<<: *other-receivers
- 'barometer-kafka':
project: 'barometer'
<<: *master
<<: *other-receivers
- 'barometer-kafka':
project: 'barometer'
- dockerdir: '.'
- dockerfile: 'docker/barometer-kafka/Dockerfile'
+ dockerdir: 'docker/barometer-kafka'
<<: *master
<<: *other-receivers
- 'barometer-ves':
project: 'barometer'
<<: *master
<<: *other-receivers
- 'barometer-ves':
project: 'barometer'
- dockerdir: '.'
- dockerfile: 'docker/barometer-ves/Dockerfile'
+ dockerdir: 'docker/barometer-ves'
+ <<: *master
+ <<: *other-receivers
+ - 'barometer-snmp':
+ project: 'barometer'
+ dockerdir: 'docker/barometer-snmp'
<<: *master
<<: *other-receivers
- 'bottlenecks':
<<: *master
<<: *other-receivers
- 'bottlenecks':
@@
-91,6
+95,11
@@
dockerfile: 'docker/Dockerfile.local'
<<: *master
<<: *other-receivers
dockerfile: 'docker/Dockerfile.local'
<<: *master
<<: *other-receivers
+ - 'qtip-nettest':
+ project: 'qtip'
+ dockerdir: 'contrib/nettest'
+ <<: *master
+ <<: *other-receivers
- 'storperf-master':
project: 'storperf'
dockerdir: 'docker/storperf-master'
- 'storperf-master':
project: 'storperf'
dockerdir: 'docker/storperf-master'
@@
-142,31
+151,31
@@
project: 'storperf'
dockerdir: 'docker/storperf-master'
arch_tag: 'x86_64'
project: 'storperf'
dockerdir: 'docker/storperf-master'
arch_tag: 'x86_64'
- <<: *
euphrates
+ <<: *
fraser
<<: *storperf-receivers
- 'storperf-graphite':
project: 'storperf'
dockerdir: 'docker/storperf-graphite'
arch_tag: 'x86_64'
<<: *storperf-receivers
- 'storperf-graphite':
project: 'storperf'
dockerdir: 'docker/storperf-graphite'
arch_tag: 'x86_64'
- <<: *
euphrates
+ <<: *
fraser
<<: *storperf-receivers
- 'storperf-httpfrontend':
project: 'storperf'
dockerdir: 'docker/storperf-httpfrontend'
arch_tag: 'x86_64'
<<: *storperf-receivers
- 'storperf-httpfrontend':
project: 'storperf'
dockerdir: 'docker/storperf-httpfrontend'
arch_tag: 'x86_64'
- <<: *
euphrates
+ <<: *
fraser
<<: *storperf-receivers
- 'storperf-reporting':
project: 'storperf'
dockerdir: 'docker/storperf-reporting'
arch_tag: 'x86_64'
<<: *storperf-receivers
- 'storperf-reporting':
project: 'storperf'
dockerdir: 'docker/storperf-reporting'
arch_tag: 'x86_64'
- <<: *
euphrates
+ <<: *
fraser
<<: *storperf-receivers
- 'storperf-swaggerui':
project: 'storperf'
dockerdir: 'docker/storperf-swaggerui'
arch_tag: 'x86_64'
<<: *storperf-receivers
- 'storperf-swaggerui':
project: 'storperf'
dockerdir: 'docker/storperf-swaggerui'
arch_tag: 'x86_64'
- <<: *
euphrates
+ <<: *
fraser
<<: *storperf-receivers
- 'yardstick':
project: 'yardstick'
<<: *storperf-receivers
- 'yardstick':
project: 'yardstick'
@@
-232,9
+241,9
@@
default: ""
description: "commit id to make a snapshot docker image"
- string:
default: ""
description: "commit id to make a snapshot docker image"
- string:
- name:
RELEASE_VERSION
+ name:
GERRIT_REFNAME
default: ""
default: ""
- description: "Docker tag to be built, e.g.
5.0.0, opnfv-5.0.0,
5.0.RC1"
+ description: "Docker tag to be built, e.g.
refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/
5.0.RC1"
- string:
name: DOCKERFILE
default: "{dockerfile}"
- string:
name: DOCKERFILE
default: "{dockerfile}"
@@
-259,6
+268,8
@@
triggers:
- pollscm:
cron: "*/30 * * * *"
triggers:
- pollscm:
cron: "*/30 * * * *"
+ - gerrit-trigger-tag-created:
+ project: '{project}'
publishers:
- email:
publishers:
- email: