From 76094c1917fdd48b10c3b9fa1cd23ae2e7df6d00 Mon Sep 17 00:00:00 2001 From: Lusheng Date: Fri, 10 Mar 2017 19:12:09 +0000 Subject: release-1.0.0 branch Change-Id: I7e84f25388dadd0e06fdd84446923816b0e331c9 Signed-off-by: Lusheng --- jjb/dcae/apod-analytics.yaml | 11 ++++++++--- jjb/dcae/apod-buildtools.yaml | 3 +++ jjb/dcae/apod-cdap.yaml | 6 +++++- jjb/dcae/collectors-ves.yaml | 2 ++ jjb/dcae/dcae-controller-analytics.yaml | 2 ++ jjb/dcae/dcae-controller.yaml | 3 +++ jjb/dcae/dcae-demo.yaml | 8 ++++++-- jjb/dcae/dcae-inventory.yaml | 2 ++ jjb/dcae/dcae-operation-utils.yaml | 2 ++ jjb/dcae/dmaapbc.yaml | 2 ++ jjb/dcae/pgaas.yaml | 2 ++ 11 files changed, 37 insertions(+), 6 deletions(-) diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml index 26821fdc6..6ee9bd5ca 100644 --- a/jjb/dcae/apod-analytics.yaml +++ b/jjb/dcae/apod-analytics.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' # apply to all jobs project: 'dcae/apod/analytics' @@ -28,12 +30,15 @@ maven-deploy-properties: | deployAtEnd=true script: | - /bin/bash './dcae-apod-buildtools/scripts/script-apod-analytics-daily-release.sh' + /bin/bash \ + './dcae-apod-buildtools/scripts/script-apod-analytics-daily-release.sh' - '{project-name}-{stream}-verify-2scm-mvn-script': mvn-goals: 'clean install' script: | - /bin/bash './dcae-apod-buildtools/scripts/script-apod-analytics-verify.sh' + /bin/bash \ + './dcae-apod-buildtools/scripts/script-apod-analytics-verify.sh' - '{project-name}-{stream}-merge-2scm-mvn-script': mvn-goals: 'clean deploy' script: - /bin/bash './dcae-apod-buildtools/scripts/script-apod-analytics-merge.sh' + /bin/bash \ + './dcae-apod-buildtools/scripts/script-apod-analytics-merge.sh' diff --git a/jjb/dcae/apod-buildtools.yaml b/jjb/dcae/apod-buildtools.yaml index 700d9ef88..ac3f69f8a 100644 --- a/jjb/dcae/apod-buildtools.yaml +++ b/jjb/dcae/apod-buildtools.yaml @@ -8,6 +8,9 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' + mvn-settings: 'dcae-apod-buildtools-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcae/apod-cdap.yaml b/jjb/dcae/apod-cdap.yaml index 3d8c39414..36cf861e2 100644 --- a/jjb/dcae/apod-cdap.yaml +++ b/jjb/dcae/apod-cdap.yaml @@ -8,6 +8,9 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' + mvn-settings: 'dcae-apod-cdap-settings' files: '**' archive-artifacts: '' @@ -21,7 +24,8 @@ jobs: - '{project-name}-{stream}-daily-release-2scm-mvn-script': script: | - /bin/bash ./dcae-apod-buildtools/scripts/script-apod-cdap-daily-release.sh + /bin/bash \ + ./dcae-apod-buildtools/scripts/script-apod-cdap-daily-release.sh - '{project-name}-{stream}-verify-2scm-mvn-script': script: | /bin/bash ./dcae-apod-buildtools/scripts/script-apod-cdap-verify.sh diff --git a/jjb/dcae/collectors-ves.yaml b/jjb/dcae/collectors-ves.yaml index 3c4a541a1..eb20028d0 100644 --- a/jjb/dcae/collectors-ves.yaml +++ b/jjb/dcae/collectors-ves.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' # apply to all jobs project: 'dcae/collectors/ves' diff --git a/jjb/dcae/dcae-controller-analytics.yaml b/jjb/dcae/dcae-controller-analytics.yaml index 18f0cc076..9c2f02006 100644 --- a/jjb/dcae/dcae-controller-analytics.yaml +++ b/jjb/dcae/dcae-controller-analytics.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' mvn-settings: 'dcae-controller-analytics-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/dcae/dcae-controller.yaml b/jjb/dcae/dcae-controller.yaml index bddf1eeb9..3f7a6cca3 100644 --- a/jjb/dcae/dcae-controller.yaml +++ b/jjb/dcae/dcae-controller.yaml @@ -11,6 +11,9 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' + mvn-settings: 'dcae-controller-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/dcae/dcae-demo.yaml b/jjb/dcae/dcae-demo.yaml index ff1ce9661..12c0bd2b6 100644 --- a/jjb/dcae/dcae-demo.yaml +++ b/jjb/dcae/dcae-demo.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' mvn-settings: 'dcae-demo-settings' files: '**' archive-artifacts: '' @@ -20,14 +22,16 @@ # yamllint disable rule:line-length script: | bash dcae-demo-controller/src/main/docker-build/build.sh - bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003 + bash dcae-demo-controller/src/main/docker-build/push.sh \ + nexus3.openecomp.org:10003 # yamllint enable - '{project-name}-{stream}-merge-scm-mvn-script': mvn-goals: 'clean deploy' # yamllint disable rule:line-length script: | bash dcae-demo-controller/src/main/docker-build/build.sh - bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003 + bash dcae-demo-controller/src/main/docker-build/push.sh \ + nexus3.openecomp.org:10003 # yamllint enable - '{project-name}-{stream}-verify-scm-mvn-script': mvn-goals: 'clean install' diff --git a/jjb/dcae/dcae-inventory.yaml b/jjb/dcae/dcae-inventory.yaml index 7414f82a0..cd6088d7f 100644 --- a/jjb/dcae/dcae-inventory.yaml +++ b/jjb/dcae/dcae-inventory.yaml @@ -13,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' mvn-settings: 'dcae-dcae-inventory-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcae/dcae-operation-utils.yaml b/jjb/dcae/dcae-operation-utils.yaml index ffbd9ca33..a2bf656bb 100644 --- a/jjb/dcae/dcae-operation-utils.yaml +++ b/jjb/dcae/dcae-operation-utils.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' mvn-settings: 'dcae-operation-utils-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/dcae/dmaapbc.yaml b/jjb/dcae/dmaapbc.yaml index 1651d9916..6a538224c 100644 --- a/jjb/dcae/dmaapbc.yaml +++ b/jjb/dcae/dmaapbc.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' # apply to all jobs project: 'dcae/dmaapbc' mvn-settings: 'dcae-dmaapbc-settings' diff --git a/jjb/dcae/pgaas.yaml b/jjb/dcae/pgaas.yaml index a94b53a37..9e1d622f8 100644 --- a/jjb/dcae/pgaas.yaml +++ b/jjb/dcae/pgaas.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' mvn-settings: 'dcae-pgaas-settings' files: '**' archive-artifacts: '' -- cgit 1.2.3-korg