X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yml;h=52b1c7989fdad590a8fb957ad2575941555ad3e5;hb=79e542dffae23546da42ff35ad5219578259392b;hp=3351a5e94bcd4323755fa2b34da42d484bcf52b5;hpb=b6d433bf86cc2eeea568b5b9b52f30b8826baed3;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 3351a5e94..52b1c7989 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -19,6 +19,10 @@
       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
@@ -39,14 +43,70 @@
           project: 'releng-anteater'
           <<: *master
           <<: *other-receivers
-      - 'barometer':
+      - 'barometer-collectd':
           project: 'barometer'
+          dockerdir: 'docker/barometer-collectd'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-grafana':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-grafana'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-influxdb':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-influxdb'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-kafka':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-kafka'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-ves':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-ves'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-snmp':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-snmp'
           <<: *master
           <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
           <<: *master
           <<: *other-receivers
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'cperf':
           project: 'cperf'
           <<: *master
@@ -65,6 +125,11 @@
           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'
@@ -106,52 +171,84 @@
           <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
-          <<: *euphrates
+          <<: *fraser
           <<: *other-receivers
       - 'qtip':
           project: 'qtip'
-          <<: *euphrates
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile.local'
+          <<: *fraser
           <<: *other-receivers
       - 'storperf-master':
           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'
-          <<: *euphrates
+          <<: *fraser
           <<: *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'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           arch_tag: 'x86_64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *euphrates
+          <<: *fraser
           <<: *other-receivers
       # projects with jobs for danube
       - 'dovetail':
           project: 'dovetail'
           <<: *danube
           <<: *other-receivers
-
+      # projects with jobs for fraser
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
     # yamllint enable rule:key-duplicates
     jobs:
       - "{dockerrepo}-docker-build-push-{stream}"
@@ -206,9 +303,9 @@
           default: ""
           description: "commit id to make a snapshot docker image"
       - string:
-          name: RELEASE_VERSION
+          name: GERRIT_REFNAME
           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}"
@@ -233,6 +330,8 @@
     triggers:
       - pollscm:
           cron: "*/30 * * * *"
+      - gerrit-trigger-tag-created:
+          project: '{project}'
 
     publishers:
       - email: