Merge "Add amsterdam stream to JJB templates"
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index c6bd45f..782e6e2 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'appc-deployment-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 19ef020..82615fe 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'appc-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index b7609bd..4e6f2f3 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 27feb20..5edbd1e 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 1990c0c..4053148 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 f310f5b..4f03d99 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 87e4fd4..c0b39cb 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 91ac246..deaab94 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 d34c321..ab047d5 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 072e510..ce4f848 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 043f40f..1946041 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 af78dab..6109812 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 a8fd36d..3c21e9b 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 14a6722..543c627 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 5be4998..5607138 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 9e683cb..ccff1c5 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 1ec9e95..e2821a9 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 1e8120e..ce12261 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 2d7e431..3f4f161 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 e93bbd1..b07b848 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
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index b8c33df..adba3e9 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -16,3 +16,5 @@
stream:
- master:
branch: 'master'
+ - amsterdam:
+ branch: 'amsterdam'
diff --git a/jjb/global-jjb b/jjb/global-jjb
index cda2ec1..98512a2 160000
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit cda2ec16956502d39e9cffb1843987c03aca8c00
+Subproject commit 98512a2a3e4aacecc5834f4d3b51d8c5333045ff
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index c3f0542..781e376 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -15,6 +15,22 @@
default: '{test-options}'
description: 'Robot command options'
+- parameter:
+ name: html-publisher-dir
+ parameters:
+ - string:
+ name: HTMLDIR
+ default: '{html-dir}'
+ description: 'Directory location to be used by HTML publisher plugin'
+
+- parameter:
+ name: html-publisher-files
+ parameters:
+ - string:
+ name: HTMLFILES
+ default: '{html-files}'
+ description: 'File name to be used by HTML publisher plugin to produce the report'
+
- builder:
name: integration-install-robotframework
builders:
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 4018309..ccba91a 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -54,6 +54,76 @@
- lf-infra-publish
- job-template:
+ name: '{project-name}-{stream}-verify-csit-{functionality}-testng'
+ disabled: false
+
+ project-type: freestyle
+ build-node: 'ubuntu1604-docker-8c-8g'
+ node: '{build-node}'
+
+ properties:
+ - lf-infra-properties:
+ project: 'integration'
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: 'integration'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+ - integration-test-plan:
+ test-plan: 'plans/{project-name}/{functionality}'
+ - integration-test-options:
+ test-options: '{robot-options}'
+ - html-publisher-dir:
+ html-dir: '{html-dir}'
+ - html-publisher-files:
+ html-files: '{html-files}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: 'integration'
+ branch: '{branch}'
+ files: 'test/csit/**/{project-name}/**'
+
+ builders:
+ - integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
+ - integration-run-test
+
+ publishers:
+ - integration-robot:
+ unstable-if: 0.0
+ pass-if: 100.0
+ - lf-infra-publish
+ - testng:
+ pattern: archives/testng-results.xml
+ escape-test-description: true
+ escape-exception-msg: true
+ show-failed-builds: true
+ - html-publisher:
+ allow-missing: false
+ dir: '{html-dir}'
+ files: '{html-files}'
+ keep-all: false
+ link-to-last-build: false
+ name: ExtentReport
+
+- job-template:
name: '{project-name}-{stream}-csit-{functionality}'
disabled: false
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index be4ad0c..ff6c9dc 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'oparent-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2df7027..a844d05 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -35,6 +35,8 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 5f3b31d..f2b19e4 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -24,6 +24,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 44c6608..f463a2c 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -35,6 +35,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-drools-applications-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 7dce80e..ada359f 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -36,6 +36,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-drools-pdp-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 9f786d3..ceb228e 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -5,6 +5,7 @@
jobs:
- gerrit-maven-clm:
java-version: ''
+ build-timeout: 30
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
@@ -28,7 +29,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-stage-site-java':
- build-node: 'ubuntu1604-basebuild-4c-4g'
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
@@ -36,6 +36,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-engine-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 24ceeb5..e78d50b 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'sdnc-northbound-settings'
# due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 4f8a83f..487ab04 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'sdnc-oam-settings'
files: '**'
archive-artifacts: ''