From a5227902937566516befa875449c9b53f62da7a1 Mon Sep 17 00:00:00 2001 From: econwar Date: Thu, 17 Jan 2019 17:00:19 +0000 Subject: [PATCH] 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 --- ...dcaegen2-services-pm-mapper-push-upstream-jobs.yaml | 7 +++++-- jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml | 7 +++++-- jjb/global/global-templates-push-upstream.yaml | 2 +- jjb/global/push-upstream-jobs.sh | 2 +- jjb/oom/oom-push-upstream-jobs.yaml | 10 ++++++++-- jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml | 7 +++++-- jjb/policy/policy-api-push-upstream-jobs.yaml | 7 +++++-- jjb/policy/policy-common-push-upstream-jobs.yaml | 7 +++++-- jjb/policy/policy-core-push-upstream-jobs.yaml | 7 +++++-- jjb/policy/policy-distribution-push-upstream-jobs.yaml | 7 +++++-- jjb/policy/policy-parent-push-upstream-jobs.yaml | 7 +++++-- 11 files changed, 50 insertions(+), 20 deletions(-) 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 1ccd376fe..82bbf3cb5 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,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 35dcdb00f..ae291c2aa 100644 --- 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 06528c873..cde2a8360 100644 --- 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 a1eeace3c..492071c50 100755 --- 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 e9e39d4e1..2a48450f1 100644 --- 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 887452673..dfdbfa620 100644 --- 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 69f56e9f6..664fee2c6 100644 --- 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 be8c1c6eb..829b79784 100644 --- 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 421d63eb7..10baafd55 100644 --- 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 36854f2be..82ff3df59 100644 --- 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 f4cd04874..cd3a972ab 100644 --- 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' -- 2.25.1