diff options
32 files changed, 156 insertions, 9 deletions
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index c6bd45f56..782e6e253 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 19ef02097..82615fea8 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 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 diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index b8c33dfa2..adba3e9d2 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 -Subproject cda2ec16956502d39e9cffb1843987c03aca8c0 +Subproject 98512a2a3e4aacecc5834f4d3b51d8c5333045f diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index c3f05429e..781e3763d 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 4018309d9..ccba91a2d 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 be4ad0cac..ff6c9dc72 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 2df702731..a844d05e9 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 5f3b31dc3..f2b19e4a0 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 44c6608da..f463a2cef 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 7dce80e3c..ada359f0f 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 9f786d341..ceb228eca 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 24ceeb55c..e78d50b53 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 4f8a83f8d..487ab04cc 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: '' |