X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yml;h=491a3697d89d9454a2eb5eee64fa7fa41375803a;hb=d69386cb64206b75ccc164537e4d5ae636a6cd52;hp=414eba255c63ba8313f11917098cabadd1d1ba8e;hpb=d818173b634e7f4c910beb7e93dbee3dd032d6d7;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 414eba255..491a3697d 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -14,17 +14,25 @@
         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
             cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
             yaohelan@huawei.com helanyao@gmail.com
             juha.kosonen@nokia.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 +59,10 @@
             project: 'functest'
             <<: *master
             <<: *functest-receivers
+        - 'nfvbench':
+            project: 'nfvbench'
+            <<: *master
+            <<: *other-receivers
         - 'qtip':
             project: 'qtip'
             <<: *master
@@ -58,33 +70,38 @@
         - '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
-            <<: *other-receivers
+            <<: *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
         - 'bottlenecks':
             project: 'bottlenecks'
             <<: *danube
@@ -97,14 +114,41 @@
             project: 'qtip'
             <<: *danube
             <<: *other-receivers
-        - 'storperf':
-            project: 'storperf'
-            <<: *danube
-            <<: *other-receivers
         - 'yardstick':
             project: 'yardstick'
             <<: *danube
             <<: *other-receivers
+        # projects with jobs for euphrates
+        - 'storperf-master':
+            project: 'storperf'
+            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
 
     jobs:
         - "{dockerrepo}-docker-build-push-{stream}"
@@ -116,6 +160,7 @@
 
     dockerfile: "Dockerfile"
     dockerdir: "docker"
+    arch_tag: ""
 
     project:
         # projects with jobs for master
@@ -166,6 +211,10 @@
             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"
 
     scm:
         - git-scm