From: Liam Fallon <liam.fallon@est.tech>
Date: Fri, 18 Jan 2019 12:13:51 +0000 (+0000)
Subject: Merge "Add jjb jobs for policy/parent"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=3d769737687825a83e09cfc0cd455c2ad07d519b;hp=b08fb3a8736ade3ff68113fb7e5a432569ab47ec;p=infra%2Fcicd.git

Merge "Add jjb jobs for policy/parent"
---

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml
index 0f380962..1ccd376f 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml
@@ -22,6 +22,6 @@
     name: dcaegen2-services-pm-mapper-push-upstream
     project: dcaegen2/services/pm-mapper
     project-name: dcaegen2-services-pm-mapper
-    branch: nordix-dev
+    branch: master
     jobs:
       - '{project-name}-push-upstream'
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-verify-jobs.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-verify-jobs.yaml
index 3f118ae2..9ba1066c 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper-verify-jobs.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper-verify-jobs.yaml
@@ -28,7 +28,7 @@
     project-name: dcaegen2-services-pm-mapper
 
     stream:
-      - nordix-dev:
+      - master:
           branch: '{stream}'
 
     jobs:
diff --git a/jjb/oom/oom-rebase-jobs.yaml b/jjb/oom/oom-rebase-jobs.yaml
index c787bb30..b256c05a 100644
--- a/jjb/oom/oom-rebase-jobs.yaml
+++ b/jjb/oom/oom-rebase-jobs.yaml
@@ -27,5 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
     jobs:
       - '{project-name}-{stream}-rebase'