From: afenner <andrew.fenner@est.tech>
Date: Thu, 1 Aug 2019 08:20:08 +0000 (+0100)
Subject: correct branches for collectors and collectors/datafile
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;ds=inline;h=2472bca0008bde4016aa1b005225fd289c3cd8c4;p=infra%2Fcicd.git

correct branches for collectors and collectors/datafile

Change-Id: I46ba63d9c65307a0a9e5efeb1a6fca3107fe0047
Signed-off-by: afenner <andrew.fenner@est.tech>
---

diff --git a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-push-upstream-jobs.yaml b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-push-upstream-jobs.yaml
index f61bc0d1..49a95cd7 100644
--- a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-push-upstream-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-push-upstream-jobs.yaml
@@ -19,13 +19,15 @@
 #
 # this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
 - project:
-    name: temp-dcaegen2-collectors-datafile-push-upstream
+    name: dcaegen2-collectors-datafile-push-upstream
     project: dcaegen2/collectors/datafile
-    project-name: temp-dcaegen2-collectors-datafile
+    project-name: dcaegen2-collectors-datafile
 
     stream:
       - master:
           branch: '{stream}'
+      - dublin:
+          branch: '{stream}'          
 
     jobs:
       - 'onap-{project-name}-{stream}-push-upstream'
diff --git a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-rebase-jobs.yaml b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-rebase-jobs.yaml
index 9fb66cf1..1aedb54b 100644
--- a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-rebase-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-rebase-jobs.yaml
@@ -20,13 +20,15 @@
 # this job gets triggered when a change is merged to
 # dcaegen2/collectors/datafile project on ONAP Gerrit.
 - project:
-    name: temp-dcaegen2-collectors-datafile-rebase
+    name: dcaegen2-collectors-datafile-rebase
     project: dcaegen2/collectors/datafile
-    project-name: temp-dcaegen2-collectors-datafile
+    project-name: dcaegen2-collectors-datafile
 
     stream:
       - master:
           branch: '{stream}'
+      - dublin:
+          branch: '{stream}'          
 
     jobs:
       - 'onap-{project-name}-{stream}-rebase'
diff --git a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
index ced78bb2..8583ecc9 100644
--- a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
@@ -20,13 +20,15 @@
 # this job gets triggered when a change is proposed to
 # dcaegen2/collectors/datafile project on Nordix Gerrit.
 - project:
-    name: temp-dcaegen2-collectors-datafile-verify
+    name: dcaegen2-collectors-datafile-verify
     project: dcaegen2/collectors/datafile
-    project-name: temp-dcaegen-collectors-datafile
+    project-name: dcaegen2-collectors-datafile
 
     stream:
       - master:
           branch: '{stream}'
+      - dublin:
+          branch: '{stream}'
 
     jobs:
-      - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file
+      - 'onap-{project-name}-{stream}-verify-java'
diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml
index a76ac998..bf2d73b8 100644
--- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml
@@ -25,8 +25,7 @@
     stream:
       - master:
           branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
+
 
     jobs:
       - 'onap-{project-name}-{stream}-push-upstream'
diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml
index e00bb3f0..4f1792d2 100644
--- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml
@@ -29,10 +29,7 @@
     stream:
       - master:
           branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
+
 
     jobs:
       - 'onap-{project-name}-{stream}-rebase'
diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
index 0f222c3e..b7020035 100644
--- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
@@ -27,14 +27,8 @@
     project-name: dcaegen2-collectors
 
     stream:
-      - nordix-dev:
-          branch: '{stream}'
       - master:
           branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'