From 118d69d1b2278fc859113d00ce32b2988569afb7 Mon Sep 17 00:00:00 2001
From: Emma Foley <efoley@redhat.com>
Date: Wed, 25 Nov 2020 19:38:39 +0000
Subject: [PATCH] [barometer] Add Jerma jobs

Change-Id: If45a8e5c9f191ba002293c7a709c788e8a628461
Signed-off-by: Emma Foley <efoley@redhat.com>
---
 jjb/barometer/barometer-rtd-jobs.yaml |  4 ++
 jjb/barometer/barometer.yaml          |  4 ++
 jjb/releng/opnfv-docker.yaml          | 96 ++++++++++++++++++-----------------
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/jjb/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml
index a8ec686a4..4f56829ef 100644
--- a/jjb/barometer/barometer-rtd-jobs.yaml
+++ b/jjb/barometer/barometer-rtd-jobs.yaml
@@ -12,6 +12,10 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - jerma: &jerma
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index f61110a40..b01a89051 100644
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -19,6 +19,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - jerma: &jerma
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 29a66f177..7795ba27c 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -259,53 +259,6 @@
           <<: *other-receivers
 
       # projects with jobs for iruya
-      - 'barometer-dma':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-dma'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-collectd':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-collectd'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-collectd-experimental':
-          project: 'barometer'
-          dockerdir: '.'
-          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-collectd-master':
-          project: 'barometer'
-          dockerdir: '.'
-          dockerfile: 'docker/barometer-collectd-master/Dockerfile'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-grafana':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-grafana'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-influxdb':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-influxdb'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-kafka':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-kafka'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-ves':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-ves'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-snmp':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-snmp'
-          <<: *iruya
-          <<: *other-receivers
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
@@ -343,6 +296,55 @@
           <<: *iruya
           <<: *storperf-receivers
 
+      # projects with jobs for jerma
+      - 'barometer-collectd':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-collectd'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-collectd-experimental':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-collectd-latest':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-latest/Dockerfile'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-dma':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-dma'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-grafana':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-grafana'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-influxdb':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-influxdb'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-kafka':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-kafka'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-ves':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-ves'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-snmp':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-snmp'
+          <<: *jerma
+          <<: *other-receivers
+
     # yamllint enable rule:key-duplicates
     jobs:
       - "{dockerrepo}-docker-build-push-{stream}"
-- 
2.16.6