StorPerf Iruya Docker Builds

Creates jobs for building the StorPerf containers in the Iruya
branch.

Change-Id: I00422d88adbddc2e154e5a54947059fb78c116a7
Signed-off-by: Mark Beierl <mbeierl@vmware.com>

2 files changed, 35 insertions, 27 deletions

diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index a259da587..1269edb33 100644
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ b/jjb/releng/opnfv-docker-arm.yaml
@@ -15,15 +15,11 @@
       stream: euphrates
       branch: 'stable/{stream}'
       disabled: false
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      disabled: false
-    gambia: &gambia
-      stream: gambia
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       disabled: false
-    hunter: &hunter
+    iruya: &iruya
       stream: hunter
       branch: 'stable/{stream}'
       disabled: false
@@ -35,7 +31,7 @@
       receivers: >
           cristina.pauna@enea.com
           alexandru.avadanii@enea.com
-          mark.beierl@emc.com
+          mbeierl@vmware.com
     yardstick-arm-receivers: &yardstick-arm-receivers
       receivers: >
           cristina.pauna@enea.com
@@ -96,50 +92,55 @@
           project: 'yardstick'
           <<: *master
           <<: *yardstick-arm-receivers
+
       # projects with jobs for stable/euphrates
       - 'dovetail':
           project: 'dovetail'
           <<: *euphrates
           <<: *dovetail-arm-receivers
+
+      # projects with jobs for stable/hunter
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *hunter
+          <<: *yardstick-arm-receivers
+
+      # projects with jobs for stable/iruya
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
           docker_repo_name: 'opnfv/storperf-master'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           docker_repo_name: 'opnfv/storperf-graphite'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           docker_repo_name: 'opnfv/storperf-httpfrontend'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           docker_repo_name: 'opnfv/storperf-reporting'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           docker_repo_name: 'opnfv/storperf-swaggerui'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
-      - 'yardstick':
-          project: 'yardstick'
-          <<: *hunter
-          <<: *yardstick-arm-receivers
 
     # yamllint enable rule:key-duplicates
     jobs:
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 367a1e730..06b7b683a 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -15,13 +15,17 @@
       stream: hunter
       branch: 'stable/{stream}'
       disabled: false
+    iruya: &iruya
+      stream: iruya
+      branch: 'stable/{stream}'
+      disabled: false
     laas-receivers: &laas_receivers
       receivers: >
           pberberian@iol.unh.edu
           sbergeron@iol.unh.edu
     storperf-receivers: &storperf-receivers
       receivers: >
-          mark.beierl@emc.com
+          mbeierl@vmware.com
     yardstick-receivers: &yardstick-receivers
       receivers: >
           rexlee8776@gmail.com
@@ -326,40 +330,43 @@
           project: 'bottlenecks'
           <<: *hunter
           <<: *other-receivers
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *hunter
+          <<: *yardstick-receivers
+
+      # projects with jobs for iruya
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
-      - 'yardstick':
-          project: 'yardstick'
-          <<: *hunter
-          <<: *yardstick-receivers
+
     # yamllint enable rule:key-duplicates
     jobs:
       - "{dockerrepo}-docker-build-push-{stream}"