Add push-upstream jobs for multiple branches

Change names of all push-upstream jobs to match new template

Change-Id: I1bbb7efca78a3206bc77cfa06b9b1d8400ac3d07
Signed-off-by: econwar <conor.ward@est.tech>

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 1ccd376fee5c887ec1531aa587d904353831ea04..82bbf3cb5a2ee6cc5f9b74f982074da3fac4bc6b 100644 (file)
--- 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,9 @@
     name: dcaegen2-services-pm-mapper-push-upstream
     project: dcaegen2/services/pm-mapper
     project-name: dcaegen2-services-pm-mapper
-    branch: master
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml b/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
index 35dcdb00f238976ab96b3f59cd0083fe525be4ed..ae291c2aa9dff0c739b0e3601a96156ed97a7609 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
+++ b/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
@@ -22,6 +22,9 @@
     name: dmaap-datarouter-push-upstream
     project: dmaap/datarouter
     project-name: dmaap-datarouter
-    branch: nordix-dev
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml
index 06528c8731e69e11e95b665e4fd08ed5930afe75..cde2a836058691698d2132fd02e4df71c999b1f1 100644 (file)
--- a/jjb/global/global-templates-push-upstream.yaml
+++ b/jjb/global/global-templates-push-upstream.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{project-name}-push-upstream'
+    name: '{project-name}-{stream}-push-upstream'
 
     node: onap-ubuntu1604
 

diff --git a/jjb/global/push-upstream-jobs.sh b/jjb/global/push-upstream-jobs.sh
index a1eeace3c22aef09b0d082d86d58ca20b1292c1a..492071c5086d0d848de0e40934052b9fb667f88d 100755 (executable)
--- a/jjb/global/push-upstream-jobs.sh
+++ b/jjb/global/push-upstream-jobs.sh
@@ -61,7 +61,7 @@ fi
 
 echo "Committing changes and pushing upstream"
 git commit -as -m "$message"
-git push upstream HEAD:refs/for/master
+git push upstream HEAD:refs/for/$BRANCH
 
 retVal1=$?
 if [[ $retVal1 -eq 0 ]]

diff --git a/jjb/oom/oom-push-upstream-jobs.yaml b/jjb/oom/oom-push-upstream-jobs.yaml
index e9e39d4e19cf3a44ba97886c24d90bcdc46e6ca9..2a48450f12fe5954404d956ce3d6105dbfb7bcbf 100644 (file)
--- a/jjb/oom/oom-push-upstream-jobs.yaml
+++ b/jjb/oom/oom-push-upstream-jobs.yaml
@@ -22,6 +22,12 @@
     name: oom-push-upstream
     project: oom
     project-name: oom
-    branch: nordix-dev
+
+    stream:
+      - master:
+          branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml b/jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml
index 887452673ffde744b9f0f3d5f7bdcdd19b2e6e08..dfdbfa620a49911945babef46090343fea15cfa3 100644 (file)
--- a/jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml
+++ b/jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml
@@ -23,6 +23,9 @@
     name: policy-apex-pdp-push-upstream
     project: policy/apex-pdp
     project-name: policy-apex-pdp
-    branch: master
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/policy/policy-api-push-upstream-jobs.yaml b/jjb/policy/policy-api-push-upstream-jobs.yaml
index 69f56e9f647bf8ebe9202076d4ad391a62bcf893..664fee2c6c970a1336c99df89da0bdc04598a99f 100644 (file)
--- a/jjb/policy/policy-api-push-upstream-jobs.yaml
+++ b/jjb/policy/policy-api-push-upstream-jobs.yaml
@@ -23,6 +23,9 @@
     name: policy-api-push-upstream
     project: policy/api
     project-name: policy-api
-    branch: master
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/policy/policy-common-push-upstream-jobs.yaml b/jjb/policy/policy-common-push-upstream-jobs.yaml
index be8c1c6eb2e9c92593eecb8fa019896f5eb07500..829b79784033bbccdf035a168e3a4364455dce9c 100644 (file)
--- a/jjb/policy/policy-common-push-upstream-jobs.yaml
+++ b/jjb/policy/policy-common-push-upstream-jobs.yaml
@@ -23,6 +23,9 @@
     name: policy-common-push-upstream
     project: policy/common
     project-name: policy-common
-    branch: master
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/policy/policy-core-push-upstream-jobs.yaml b/jjb/policy/policy-core-push-upstream-jobs.yaml
index 421d63eb7cba660b5918107653a4136c88924805..10baafd55f31d6cb36b53f2df816bc95da55cae0 100644 (file)
--- a/jjb/policy/policy-core-push-upstream-jobs.yaml
+++ b/jjb/policy/policy-core-push-upstream-jobs.yaml
@@ -23,6 +23,9 @@
     name: policy-core-push-upstream
     project: policy/core
     project-name: policy-core
-    branch: master
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/policy/policy-distribution-push-upstream-jobs.yaml b/jjb/policy/policy-distribution-push-upstream-jobs.yaml
index 36854f2bea202104f7d3a143d456e8403fbcc903..82ff3df599a5de16e6e1f014b7c2fe2d71765c10 100644 (file)
--- a/jjb/policy/policy-distribution-push-upstream-jobs.yaml
+++ b/jjb/policy/policy-distribution-push-upstream-jobs.yaml
@@ -23,6 +23,9 @@
     name: policy-distribution-push-upstream
     project: policy/distribution
     project-name: policy-distribution
-    branch: master
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/policy/policy-parent-push-upstream-jobs.yaml b/jjb/policy/policy-parent-push-upstream-jobs.yaml
index f4cd04874ec9a89655e97a71b5360a368dbe917e..cd3a972ab3ac56ab336314cb97e9b217ef71c0c8 100644 (file)
--- a/jjb/policy/policy-parent-push-upstream-jobs.yaml
+++ b/jjb/policy/policy-parent-push-upstream-jobs.yaml
@@ -23,6 +23,9 @@
     name: policy-parent-push-upstream
     project: policy/parent
     project-name: policy-parent
-    branch: master
+    stream:
+      - master:
+          branch: '{stream}'
+
     jobs:
-      - '{project-name}-push-upstream'
+      - '{project-name}-{stream}-push-upstream'