From: Aric Gardner <agardner@linuxfoundation.org>
Date: Wed, 18 Dec 2019 20:59:00 +0000 (+0000)
Subject: Merge "Add Dovetail Hunter Branch for OVP 2019.12 Release"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=961fc01f1c2293982ae9f0921963a4ac77b7a66d;hp=213cb90d610fa00704b2a1c03c7fd38b5e0dff1d;p=releng.git

Merge "Add Dovetail Hunter Branch for OVP 2019.12 Release"
---

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index a0741f1ee..c11b4e13d 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -38,12 +38,19 @@
       - 'vnf'
       - 'smoke-cntt'
       - 'benchmarking-cntt'
+      - 'features'
 
     exclude:
       - stream: 'master'
         image: 'tempest'
       - stream: 'jerma'
         image: 'tempest'
+      - stream: 'master'
+        image: 'features'
+      - stream: 'jerma'
+        image: 'features'
+      - stream: 'iruya'
+        image: 'features'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -154,6 +161,10 @@
               <<: *build-job-settings
             - name: 'functest-vnf-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-features-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-features-docker-build-arm64-{stream}'
+              <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
           condition: SUCCESSFUL
@@ -167,6 +178,8 @@
               <<: *manifest-job-settings
             - name: 'functest-vnf-docker-manifest-{stream}'
               <<: *manifest-job-settings
+            - name: 'functest-features-docker-manifest-{stream}'
+              <<: *manifest-job-settings
       - multijob:
           name: 'build all functest cntt images'
           condition: SUCCESSFUL
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 598ff5b2f..fbfa051d3 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -14,7 +14,7 @@
     stream:
       - master:
           branch: 'master'
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
 
 - job-template:
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}"
diff --git a/releases/iruya/storperf.yaml b/releases/iruya/storperf.yaml
new file mode 100644
index 000000000..17f5b6ae4
--- /dev/null
+++ b/releases/iruya/storperf.yaml
@@ -0,0 +1,9 @@
+---
+project: storperf
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      storperf: 8d97778672f843cd79ac9862b5fe8c13ef31091f