X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yml;h=1a3db3a5fa0dcc49b3c04be726ac6534908c15aa;hb=ec23df42c5cb0151b1902244c1beb50711dd868a;hp=9d27329ed85b7d8a4cdd780870299b22c25124a9;hpb=1e5d0a8a7b71e964940a63175c3495402312b896;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 9d27329ed..1a3db3a5f 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -14,17 +14,24 @@
         stream: danube
         branch: 'stable/{stream}'
         disabled: false
+    euphrates: &euphrates
+        stream: euphrates
+        branch: 'stable/{stream}'
+        disabled: false
     functest-receivers: &functest-receivers
         receivers: >
-            jose.lausuch@ericsson.com morgan.richomme@orange.com
+            jalausuch@suse.com morgan.richomme@orange.com
             cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
-            yaohelan@huawei.com helanyao@gmail.com
-            juha.kosonen@nokia.com
+            juha.kosonen@nokia.com wangwulin@huawei.com
+    storperf-receivers: &storperf-receivers
+        receivers: >
+            mark.beierl@emc.com
     other-receivers: &other-receivers
         receivers: ''
 
     dockerfile: "Dockerfile"
     dockerdir: "docker"
+    arch_tag: ""
 
     # This is the dockerhub repo the image will be pushed to as
     # 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter.
@@ -51,6 +58,10 @@
             project: 'functest'
             <<: *master
             <<: *functest-receivers
+        - 'nfvbench':
+            project: 'nfvbench'
+            <<: *master
+            <<: *other-receivers
         - 'qtip':
             project: 'qtip'
             <<: *master
@@ -58,47 +69,88 @@
         - 'storperf-master':
             project: 'storperf'
             dockerdir: 'docker/storperf-master'
+            arch_tag: 'x86_64'
             <<: *master
-            <<: *other-receivers
+            <<: *storperf-receivers
+        - 'storperf-graphite':
+            project: 'storperf'
+            dockerdir: 'docker/storperf-graphite'
+            arch_tag: 'x86_64'
+            <<: *master
+            <<: *storperf-receivers
         - 'storperf-httpfrontend':
             project: 'storperf'
             dockerdir: 'docker/storperf-httpfrontend'
+            arch_tag: 'x86_64'
             <<: *master
-            <<: *other-receivers
+            <<: *storperf-receivers
         - 'storperf-reporting':
             project: 'storperf'
             dockerdir: 'docker/storperf-reporting'
+            arch_tag: 'x86_64'
             <<: *master
-            <<: *other-receivers
+            <<: *storperf-receivers
         - 'storperf-swaggerui':
             project: 'storperf'
             dockerdir: 'docker/storperf-swaggerui'
+            arch_tag: 'x86_64'
             <<: *master
-            <<: *other-receivers
+            <<: *storperf-receivers
         - 'yardstick':
             project: 'yardstick'
             <<: *master
             <<: *other-receivers
-        # projects with jobs for stable
+        # projects with jobs for Danube
+        - 'qtip':
+            project: 'qtip'
+            <<: *euphrates
+            <<: *other-receivers
+        - 'yardstick':
+            project: 'yardstick'
+            <<: *euphrates
+            <<: *other-receivers
+        # projects with jobs for euphrates
         - 'bottlenecks':
             project: 'bottlenecks'
-            <<: *danube
+            <<: *euphrates
             <<: *other-receivers
         - 'functest':
             project: 'functest'
-            <<: *danube
+            <<: *euphrates
             <<: *functest-receivers
-        - 'qtip':
-            project: 'qtip'
-            <<: *danube
-            <<: *other-receivers
-        - 'storperf':
+        - 'storperf-master':
             project: 'storperf'
-            <<: *danube
-            <<: *other-receivers
-        - 'yardstick':
-            project: 'yardstick'
-            <<: *danube
+            dockerdir: 'docker/storperf-master'
+            arch_tag: 'x86_64'
+            <<: *euphrates
+            <<: *storperf-receivers
+        - 'storperf-graphite':
+            project: 'storperf'
+            dockerdir: 'docker/storperf-graphite'
+            arch_tag: 'x86_64'
+            <<: *euphrates
+            <<: *storperf-receivers
+        - 'storperf-httpfrontend':
+            project: 'storperf'
+            dockerdir: 'docker/storperf-httpfrontend'
+            arch_tag: 'x86_64'
+            <<: *euphrates
+            <<: *storperf-receivers
+        - 'storperf-reporting':
+            project: 'storperf'
+            dockerdir: 'docker/storperf-reporting'
+            arch_tag: 'x86_64'
+            <<: *euphrates
+            <<: *storperf-receivers
+        - 'storperf-swaggerui':
+            project: 'storperf'
+            dockerdir: 'docker/storperf-swaggerui'
+            arch_tag: 'x86_64'
+            <<: *euphrates
+            <<: *storperf-receivers
+        - 'nfvbench':
+            project: 'nfvbench'
+            <<: *euphrates
             <<: *other-receivers
 
     jobs:
@@ -111,6 +163,7 @@
 
     dockerfile: "Dockerfile"
     dockerdir: "docker"
+    arch_tag: ""
 
     project:
         # projects with jobs for master
@@ -161,6 +214,15 @@
             name: DOCKERFILE
             default: "{dockerfile}"
             description: "Dockerfile to use for creating the image."
+        - string:
+            name: ARCH_TAG
+            default: "{arch_tag}"
+            description: "If set, this value will be added to the docker image tag as a prefix"
+
+    properties:
+        - throttle:
+            max-per-node: 1
+            option: 'project'
 
     scm:
         - git-scm