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 f61bc0d1a6ec354b467c1a8851859c57a0d6ed96..49a95cd79fe8378536403ff495324dc8f8943516 100644 (file)
--- 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 9fb66cf1da3c652c7ec8fb0225ab900c21bfa154..1aedb54b71dd3e6d821a1a271026a398c47320f9 100644 (file)
--- 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 ced78bb28939ca4006ce9fc26c6dac668db7b803..8583ecc957cc8dac88e8176e2ba7593733952df1 100644 (file)
--- 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 a76ac998758d15848593e3fd076713debb74a42a..bf2d73b8f017c2db8818ea3a3ce7397209e43c98 100644 (file)
--- 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 e00bb3f0995b22ec06bbb10481986c4860f35936..4f1792d2922655be6952539d2c33984b125a2948 100644 (file)
--- 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 0f222c3ec107a46acd83a19f5e2b1a3f16399944..b70200357276bf765201c76e98b199321f364a3a 100644 (file)
--- 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'