From 3dd371aa51063f99f33c0a06e4017426ba944502 Mon Sep 17 00:00:00 2001
From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Fri, 3 May 2019 17:41:02 +0000
Subject: [PATCH] Add dublin branch jobs

Add support independent versioning for dcaegen2/services
components [ONAP Helpdesk #70115]

Change-Id: I3f39e48dc7462800d6c7bc87d0427dedb395529c
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1471
---
 jjb/dcaegen2/dcaegen2-analytics-tca.yaml                    | 3 ++-
 jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml           | 2 ++
 jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml                | 2 ++
 jjb/dcaegen2/dcaegen2-collectors-restconf.yaml              | 2 ++
 jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml              | 2 ++
 jjb/dcaegen2/dcaegen2-collectors-ves.yaml                   | 2 ++
 jjb/dcaegen2/dcaegen2-deployments.yaml                      | 2 ++
 jjb/dcaegen2/dcaegen2-platform-blueprints.yaml              | 2 ++
 jjb/dcaegen2/dcaegen2-platform-configbinding.yaml           | 2 ++
 jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml      | 2 ++
 jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml           | 2 ++
 jjb/dcaegen2/dcaegen2-platform-plugins.yaml                 | 2 ++
 jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml          | 2 ++
 jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml | 2 ++
 jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml | 5 ++++-
 jjb/dcaegen2/dcaegen2-services-heartbeat.yaml               | 2 ++
 jjb/dcaegen2/dcaegen2-services-mapper.yaml                  | 2 ++
 jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml               | 2 ++
 jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml           | 7 ++++++-
 jjb/dcaegen2/dcaegen2-services-prh.yaml                     | 2 ++
 jjb/dcaegen2/dcaegen2-services-sdk.yaml                     | 2 ++
 jjb/dcaegen2/dcaegen2-services-son-handler.yaml             | 2 ++
 jjb/dcaegen2/dcaegen2-utils.yaml                            | 2 ++
 jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml                     | 4 ++++
 24 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index fc3522d70..d32d4b91f 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -7,7 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
-
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
index 749d01e41..710850355 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites':
           trigger_jobs:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index a328fd60d..3a574a504 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 44faf9b17..1be57266b 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 0ef35e629..79dab04c5 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index eb7a8fdef..d7bc96472 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index f1943d43d..5dee64645 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 6d35e186b..285d4e0ee 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 4b161fbc1..8f753b4a3 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 8f2c351c7..b6bb261d6 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 385274b39..d33b745b0 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 489cb013e..3909a2342 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-plugins-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index a93fd571b..cb19425a6 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
index 559370c57..bf4cdf5e2 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 670cbd844..2e49ee55a 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -6,7 +6,8 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
+            version-properties: 'components/bbs-event-processor/version.properties'
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'
@@ -14,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index ff7f9ae73..3527ffd87 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index c5fc0d476..e319e68a6 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 70302c114..0d6687f8b 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
index 38216d1e8..1d4bcf2e5 100644
--- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
@@ -4,7 +4,12 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-pmmapper'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+
     functionality:
       - 'pmmapper':
           trigger_jobs:
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index b49c36082..8e3047f7e 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 1c9187072..2c12df9f1 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 0e637f36a..b4d2b5c5b 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 4e579b65e..d91b3789c 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-utils-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index 2d11c7fbd..4c610e167 100644
--- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites'
     trigger_jobs:
@@ -21,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'prh-testsuites'
     trigger_jobs:
-- 
2.16.6