diff options
Diffstat (limited to 'jjb')
33 files changed, 178 insertions, 81 deletions
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 89eeaf4b6..336001e14 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -22,7 +22,7 @@ cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/cadi' - project-name: 'aaf-cadi' + project-name: 'aaf-cadi-shiro' branch: 'master' mvn-params: '-f shiro/pom.xml' mvn-settings: 'aaf-cadi-settings' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 41ea0ee5f..37cdb1f99 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -10,6 +10,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: '**' @@ -24,7 +26,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-aai-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -34,8 +36,9 @@ name: aai-aai-common-clm jobs: - gerrit-maven-clm + build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 91c7dac0e..1b2a9e686 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/cacher' project-name: 'aai-cacher' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-cacher-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,7 +42,7 @@ - gerrit-maven-clm project: 'aai/cacher' project-name: 'aai-cacher' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 6f85de024..2b29487df 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/graphadmin' project-name: 'aai-graphadmin' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-graphadmin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,6 +42,6 @@ - gerrit-maven-clm project: 'aai/graphadmin' project-name: 'aai-graphadmin' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index af670d4a9..ef87c104a 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/resources' project-name: 'aai-resources' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-resources-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,6 +42,6 @@ - gerrit-maven-clm project: 'aai/resources' project-name: 'aai-resources' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index fa7719ba6..259598070 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -14,12 +14,3 @@ mvn-settings: 'aai-sparky-fe-settings' files: '**' archive-artifacts: '' - -- project: - name: aai-sparky-fe-clm - jobs: - - gerrit-maven-clm - project: 'aai/sparky-fe' - project-name: 'aai-sparky-fe' - branch: 'master' - mvn-settings: 'aai-sparky-fe-settings' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 82385bf49..058a2852f 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/traversal' project-name: 'aai-traversal' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-traversal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,6 +42,6 @@ - gerrit-maven-clm project: 'aai/traversal' project-name: 'aai-traversal' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml index 7e4e9cde4..3fe00498d 100644 --- a/jjb/appc/appc-csit.yaml +++ b/jjb/appc/appc-csit.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: master + - 'casablanca': + branch: 'casablanca' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 040913b18..a863e6ef3 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -27,6 +27,8 @@ jobs: - 'docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - 'docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' project: 'appc/deployment' stream: - 'master': diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 5949e1a47..c93263077 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -32,8 +30,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml b/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml deleted file mode 100644 index 5fad5875a..000000000 --- a/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: dcae-bulkpm-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'dcae-bulkpm' - stream: 'master' - functionality: - - 'bulkpm-suite': - trigger_jobs: - - '{project-name}-{stream}-docker-java-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml new file mode 100644 index 000000000..812b22fcd --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -0,0 +1,36 @@ +--- +- project: + name: dcaegen2-collectors-restconf + project-name: 'dcaegen2-collectors-restconf' + jobs: + - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/collectors/restconf' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-collectors-restconf-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: '' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-collectors-restconf-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/collectors/restconf' + project-name: 'dcaegen2-collectors-restconf' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-restconf-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 4683292b9..c3d19f5ee 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -4,7 +4,6 @@ name: demo project-name: 'demo' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index a7fe91608..70804c45d 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'functionality1': trigger_jobs: diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 9b711ec8e..20d86181b 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -73,3 +73,11 @@ pattern: 'pylog/**' jobs: - '{project-name}-{stream}-{subproject}-verify-python' + +- project: + name: logging-analytics-info + project-name: 'logging-analytics' + jobs: + - gerrit-info-yaml-verify + project: 'logging-analytics' + branch: 'master' diff --git a/jjb/optf/build-optf-cmso-docker-image.sh b/jjb/optf/build-optf-cmso-docker-image.sh new file mode 100644 index 000000000..7bfa07893 --- /dev/null +++ b/jjb/optf/build-optf-cmso-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./docker/*.*
+
+./docker/build_image.sh
diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml new file mode 100644 index 000000000..b655a6752 --- /dev/null +++ b/jjb/optf/optf-cmso-csit.yaml @@ -0,0 +1,15 @@ +---
+- project:
+ name: optf-cmso-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'optf-cmso'
+ stream:
+ - 'master':
+ branch: master
+ functionality:
+ - 'cmso':
+ trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml new file mode 100644 index 000000000..e6ef1f980 --- /dev/null +++ b/jjb/optf/optf-cmso.yaml @@ -0,0 +1,64 @@ +---
+- project:
+ name: optf-cmso
+ project-name: 'optf-cmso'
+ project: 'optf/cmso'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'optf-cmso-settings'
+ subproject:
+ - 'cmso':
+ path: '.'
+ pattern: '**'
+ pom: 'pom.xml'
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-builder-4c-4g'
+
+- project:
+ name: optf-cmso-docker
+ project-name: 'optf-cmso'
+ project: 'optf/cmso'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'optf-cmso-settings'
+ subproject:
+ - 'cmso':
+ path: '.'
+ pattern: '**'
+ pom: 'pom.xml'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ mvn-params: '-Dmaven.test.skip=true'
+ script:
+ !include-raw-escape: 'build-optf-cmso-docker-image.sh'
+ build-node: queue-docker-4c-4g
+ - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ mvn-params: '-Dmaven.test.skip=true'
+ script:
+ !include-raw-escape: 'build-optf-cmso-docker-image.sh'
+ build-node: queue-docker-4c-4g
+
+- project:
+ name: optf-cmso-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'optf/cmso'
+ project-name: 'optf-cmso'
+ branch: 'master'
+ mvn-settings: 'optf-cmso-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 59fd25434..7b490cb2a 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -16,7 +16,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false project: 'policy/apex-pdp' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 4e1aa98f2..8607d28cc 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/common' stream: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 7a27d29c4..bc5bcc672 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -13,7 +13,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/distribution' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 6d8f1522b..04f5ef392 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 4fb26a07b..cb125b02c 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -17,7 +17,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false project: 'policy/drools-pdp' stream: diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 4399e907d..f116f7bf5 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -17,7 +17,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false project: 'policy/engine' stream: diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index c36a9a47a..13e97a68e 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -6,6 +6,7 @@ - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' project: 'policy/parent' stream: diff --git a/jjb/portal-sdk/portal-sdk-csit.yaml b/jjb/portal-sdk/portal-sdk-csit.yaml deleted file mode 100644 index c5667e63d..000000000 --- a/jjb/portal-sdk/portal-sdk-csit.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- project: - name: portal-sdk-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'portal-sdk' - stream: 'master' - functionality: - - 'testsuite': - trigger_jobs: 'portal-docker-{stream}-merge-docker-script' - robot-options: '' - branch: 'master' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index b5fab5f34..fbde4c6c7 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -18,14 +18,6 @@ stream: - 'master': branch: 'master' - - 'release-2.1.0': - branch: 'release-2.1.0' - - 'release-2.1.1': - branch: 'release-2.1.1' - - 'release-2.2.0': - branch: 'release-2.2.0' - - 'release-2.3.0': - branch: 'release-2.3.0' - 'release-2.4.0': branch: 'release-2.4.0' mvn-settings: 'portal-sdk-settings' diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml deleted file mode 100644 index 697db4640..000000000 --- a/jjb/portal/portal-csit.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- project: - name: portal-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'portal' - stream: 'master' - functionality: - - 'testsuite': - trigger_jobs: 'portal-docker-{stream}-merge-docker-script' - robot-options: '' - branch: 'master' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index a6b5830ba..fa4e6516c 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -6,9 +6,14 @@ stream: - 'master': branch: 'master' + subproject: + - dcae-d-tosca-lab: + path: '.' + pattern: '**' mvn-settings: 'sdc-dcae-d-tosca-lab-settings' build-node: ubuntu1604-docker-8c-8g jobs: + - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' docker-pom: 'pom.xml' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index d084c8dba..bbe8a171e 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -17,6 +17,7 @@ mvn-profile: 'docker' mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - gerrit-maven-clm: + build-timeout: 120 mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' project: 'sdc' stream: diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 7e9b284a4..5c5a6743b 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -12,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' @@ -31,8 +29,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 2593111d6..2fa46c00c 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'Dublin_dev': + branch: 'Dublin_dev' mvn-settings: 'so-libs-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/so/so.yaml b/jjb/so/so.yaml index 5c55a6ec2..a25b20bcb 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'Dublin_dev': + branch: 'Dublin_dev' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' |