From bd8c72931b5f0182404f2b69e6db01e0a73588e0 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 27 Nov 2017 15:23:29 -0500 Subject: Add amsterdam stream Issue-ID: DCAEGEN2-206 Change-Id: Ibe0ddcc32aed679c4d6ca464c97d2f2f38df58af Signed-off-by: Lusheng Ji --- jjb/dcaegen2/apod-analytics.yaml | 2 ++ jjb/dcaegen2/dcaegen2-analytics.yaml | 2 ++ jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 2 ++ jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 2 ++ jjb/dcaegen2/dcaegen2-collectors.yaml | 2 ++ jjb/dcaegen2/dcaegen2-deployments.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-blueprints.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-cli.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-configbinding.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-plugins.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml | 2 ++ .../dcaegen2-platform-servicechange-handler.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform.yaml | 18 ++++++++++-------- jjb/dcaegen2/dcaegen2-utils.yaml | 2 ++ jjb/dcaegen2/dcaegen2.yaml | 2 ++ 18 files changed, 44 insertions(+), 8 deletions(-) diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index b7609bdea..4e6f2f3c6 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' # apply to all jobs project: 'dcaegen2/analytics/tca' diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 27feb20e7..5edbd1eeb 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-analytics-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 1990c0c63..4053148c3 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-snmptrap-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index f310f5bad..4f03d9939 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-ves-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index 87e4fd467..c0b39cb35 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 91ac246ab..deaab94fd 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-deployments-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index d34c32167..ab047d53f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-blueprints-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index 072e51031..ce4f8484b 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-cdapbroker-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 043f40f6c..19460414d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-cli-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index af78dabfc..6109812b9 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-configbinding-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index a8fd36dc3..3c21e9b42 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-deployment-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 14a67224d..543c627b1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-inventory-api-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 5be499843..560713812 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-plugins-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 9e683cb03..ccff1c56c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-policy-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 1ec9e9580..e2821a90d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index 1e8120e28..ce12261f5 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -11,11 +11,13 @@ stream: - 'master': branch: 'master' - mvn-settings: 'dcaegen2-platform-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 in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + - 'amsterdam': + branch: 'amsterdam' + mvn-settings: 'dcaegen2-platform-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 in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 2d7e4319f..3f4f16124 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-utils-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index e93bbd141..b07b848c0 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'dcaegen2-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties -- cgit 1.2.3-korg