From: Jessica Wagantall Date: Tue, 27 Nov 2018 20:19:48 +0000 (+0000) Subject: Merge "Allow docker-java to specify node" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=076d8b266e77414abfa1d113ab263c552f350538;hp=34e6d6b687dd8385c15d4ec984b8488130902eec;p=ci-management.git Merge "Allow docker-java to specify node" --- diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index a4568a1f9..5ffb23b62 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aaf-project-view + project-name: aaf + views: + - project-view + - project: name: aaf-authz project-name: 'aaf-authz' @@ -20,6 +26,25 @@ files: '**' archive-artifacts: '' +# This was not cleared with PTL, nor is it appropriate to add for CasaBlanca See PTL before adding this kind of thing +#- project: +# name: aaf-authz-arm64 +# project-name: 'aaf-authz-arm64' +# jobs: +# - '{project-name}-{stream}-docker-java-shell-daily': +# mvn-goals: 'clean install' +# settings: '{mvn-settings}' +# script: +# !include-raw-escape: 'build-aaf-docker-image.sh' +# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# project: 'aaf/authz' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'aaf-authz-settings' +# files: '**' +# archive-artifacts: '' + - project: name: aaf-authz-sonar jobs: diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 37cdb1f99..4299b1351 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-aai-common-project-view + project-name: aai-aai-common + views: + - project-view + - project: name: aai-aai-common-master project-name: 'aai-aai-common' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 436227221..8da02eb5a 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-babel-project-view + project-name: aai-babel + views: + - project-view + - project: name: aai-babel project-name: 'aai-babel' diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index 946a23cab..ff9a8fd30 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-chameleon-project-view + project-name: aai-chameleon + views: + - project-view + - project: name: aai-chameleon project-name: 'aai-chameleon' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index 46206810e..dc50ae883 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-champ-project-view + project-name: aai-champ + views: + - project-view + - project: name: aai-champ project-name: 'aai-champ' @@ -14,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-champ-settings' files: '**' archive-artifacts: '' @@ -27,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/champ' project-name: 'aai-champ' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-champ-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -38,5 +46,5 @@ - gerrit-maven-clm project: 'aai/champ' project-name: 'aai-champ' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-champ-settings' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index eb31740ce..39da6d53d 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-data-router-project-view + project-name: aai-data-router + views: + - project-view + - project: name: aai-data-router-master project-name: 'aai-data-router' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index e8596d7a1..f10975045 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-esr-gui-project-view + project-name: aai-esr-gui + views: + - project-view + - project: name: aai-esr-gui project-name: 'aai-esr-gui' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 9bed3ba6a..3dbf7a428 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-esr-server-project-view + project-name: aai-esr-server + views: + - project-view + - project: name: aai-esr-server-master project-name: 'aai-esr-server' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 5140c8fc5..38d409c2f 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-event-client-project-view + project-name: aai-event-client + views: + - project-view + - project: name: aai-event-client-master project-name: 'aai-event-client' diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 31678e5ee..0e7ac548d 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-gizmo-project-view + project-name: aai-gizmo + views: + - project-view + - project: name: aai-gizmo project-name: 'aai-gizmo' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 3454ff416..f2b802f40 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-graphadmin-project-view + project-name: aai-graphadmin + views: + - project-view + - project: name: aai-graphadmin-master project-name: 'aai-graphadmin' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index fec75f9fb..afa2ad76d 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-logging-service-project-view + project-name: aai-logging-service + views: + - project-view + - project: name: aai-logging-service-master project-name: 'aai-logging-service' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 8d54ac528..28bf078d4 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-model-loader-project-view + project-name: aai-model-loader + views: + - project-view + - project: name: aai-model-loader-master project-name: 'aai-model-loader' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 0daa0b195..cbd815ee7 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-resources-project-view + project-name: aai-resources + views: + - project-view + - project: name: aai-resources project-name: 'aai-resources' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 1e10466fb..967f5aa15 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-rest-client-project-view + project-name: aai-rest-client + views: + - project-view + - project: name: aai-rest-client-master project-name: 'aai-rest-client' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 8abae8c01..e616d4679 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-router-project-view + project-name: aai-router + views: + - project-view + - project: name: aai-router-core-master project-name: 'aai-router-core' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 334b7f273..6be8369aa 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-search-data-service-project-view + project-name: aai-search-data-service + views: + - project-view + - project: name: aai-search-data-service-master project-name: 'aai-search-data-service' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 16b7be28f..ad2a21e49 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-sparky-project-view + project-name: aai-sparky + views: + - project-view + - project: name: aai-sparky-be-master project-name: 'aai-sparky-be' diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index 1714ff59d..7803f7c5f 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-spike-project-view + project-name: aai-spike + views: + - project-view + - project: name: aai-spike project-name: 'aai-spike' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index dae6133b7..a53861d6a 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -1,4 +1,10 @@ --- +- project: + name: aai-traversal-project-view + project-name: aai-traversal + views: + - project-view + - project: name: aai-traversal-master project-name: 'aai-traversal' diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index c610857cb..488015231 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'appc-cdt-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index fc4567a09..49a254cfa 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -13,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' @@ -32,6 +34,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 1fdba4d9f..fb400baa6 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'appc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index d42d20768..99025ac08 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -1,4 +1,10 @@ --- +- project: + name: appc-project-view + project-name: appc + views: + - project-view + - project: name: appc-parent project-name: 'appc-parent' @@ -11,5 +17,7 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'appc-parent-settings' build-node: ubuntu1604-builder-2c-1g diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 2b183bc73..7a994efbc 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -1,4 +1,10 @@ --- +- project: + name: ccsdk-project-view + project-name: ccsdk + views: + - project-view + - project: name: ccsdk-apps project-name: 'ccsdk-apps' diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index d0a29e449..4ad5840ca 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -1,4 +1,10 @@ --- +- project: + name: ci-management-project-view + project-name: ci-management + views: + - project-view + - project: name: ci-management-jobs jobs: diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index c590426ab..dd556139e 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -1,4 +1,9 @@ --- +- project: + name: clamp-project-view + project-name: clamp + views: + - project-view - project: name: clamp @@ -55,4 +60,5 @@ branch: 'master' mvn-settings: 'clamp-settings' build-node: ubuntu1604-docker-8c-8g + build-timeout: 90 diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index f0c61c88a..32aa728d4 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -1,4 +1,9 @@ --- +- project: + name: cli-project-view + project-name: cli + views: + - project-view - project: name: cli diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 8a230b2c4..be6bcac03 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' # apply to all jobs project: 'dcaegen2/collectors/datafile' mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml new file mode 100644 index 000000000..bbe14d209 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -0,0 +1,42 @@ +--- +- project: + name: dcaegen2-services-sdk + project-name: 'dcaegen2-services-sdk' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/services/sdk' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-services-sdk-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-sdk-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services/sdk' + project-name: 'dcaegen2-services-sdk' + branch: 'master' + mvn-settings: 'dcaegen2-services-sdk-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-sdk-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/services/sdk + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-sdk' + branch: 'master' + mvn-settings: 'dcaegen2-services-sdk-settings' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index ce552c073..a712dac9b 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -1,4 +1,10 @@ --- +- project: + name: dcaegen2-project-view + project-name: dcaegen2 + views: + - project-view + - project: name: dcaegen2 project-name: 'dcaegen2' diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index c3d19f5ee..bf7f87f10 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -1,4 +1,9 @@ --- +- project: + name: demo-project-view + project-name: demo + views: + - project-view - project: name: demo @@ -12,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'demo-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 21077e660..dc7ecfa27 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -1,4 +1,9 @@ --- +- project: + name: dmaap-project-view + project-name: dmaap + views: + - project-view - project: name: dmaap-buscontroller diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml index d6c4765d7..b111a7c5a 100644 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ b/jjb/dmaap/dmaap-datarouter-csit.yaml @@ -5,10 +5,13 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'dmaap-datarouter' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'dr-suite': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' robot-options: '' - branch: 'master' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 516d7eb38..5652fa03c 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -19,6 +19,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'dmaap-datarouter-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml new file mode 100644 index 000000000..8d5dfe3d8 --- /dev/null +++ b/jjb/dmaap/dmaap-zookeeper.yaml @@ -0,0 +1,30 @@ +--- +- project: + name: dmaap-zookeeper + project-name: 'dmaap-zookeeper' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + project: 'dmaap/zookeeper' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dmaap-zookeeper-settings' +- project: + name: dmaap-zookeeper-docker + project-name: 'dmaap-zookeeper-docker' + jobs: + - '{project-name}-{stream}-docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + project: 'dmaap/zookeeper' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dmaap-zookeeper-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index f7f20653d..6986dffd2 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -1,4 +1,10 @@ --- +- project: + name: doc-project-view + project-name: doc + views: + - project-view + - project: name: doc project-name: 'doc' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index b160f2a1f..8f66e8cc0 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -1,4 +1,10 @@ --- +- project: + name: externalapi-project-view + project-name: externalapi + views: + - project-view + - project: name: externalapi-nbi project-name: 'externalapi-nbi' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 559f1d577..2f4b51f7f 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -1,4 +1,10 @@ --- +- project: + name: holmes-project-view + project-name: holmes + views: + - project-view + - project: name: holmes-common project-name: 'holmes-common' diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 8fea30f4b..6bdf2885f 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -9,6 +9,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' subproject: - 'sniroemulator': pom: 'test/mocks/sniroemulator/pom.xml' diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 65f166441..a1efde66a 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -1,4 +1,10 @@ --- +- project: + name: integration-project-view + project-name: integration + views: + - project-view + - project: name: integration project-name: 'integration' @@ -14,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index 2d378a13a..0f824bf26 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml @@ -15,6 +15,9 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' + mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml index 8b84dc127..53c5d0662 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml @@ -10,6 +10,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: logging-analytics-pomba-pomba-audit-common-settings files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml index d36f5ce4a..944144890 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml index d18990d34..69e8d0dd2 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml index 37e04868a..2be735865 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml index 099318c29..49d7feaab 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings files: '**' archive-artifacts: '' diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 80386843e..a9fbaaafd 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -1,4 +1,10 @@ --- +- project: + name: logging-analytics-project-view + project-name: logging-analytics + views: + - project-view + - project: name: logging-analytics project-name: 'logging-analytics' @@ -14,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'logging-analytics-settings' files: '**' archive-artifacts: '' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 03bc2d9bb..f77534081 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -1,4 +1,9 @@ --- +- project: + name: modeling-project-view + project-name: modeling + views: + - project-view - project: name: modeling-toscaparsers-javatoscachecker diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 43a8a0861..a99a484db 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -1,4 +1,10 @@ --- +- project: + name: msb-project-view + project-name: msb + views: + - project-view + - project: name: msb-apigateway project-name: 'msb-apigateway' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 0ff1cc55f..f82e09d20 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -1,4 +1,10 @@ --- +- project: + name: multicloud-project-view + project-name: multicloud + views: + - project-view + - project: name: multicloud-openstack project-name: 'multicloud-openstack' diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index 6f83f0fd3..7c2bd067d 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -13,8 +13,8 @@ stream: - 'jar-master': branch: 'master' - - 'jar-beijing': - branch: 'beijing' + - 'jar-casablanca': + branch: 'casablanca' - 'jar-release-2.5.5': branch: 'release-2.5.5' mvn-settings: 'music-settings' diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml index 1e48b35ae..81c832821 100644 --- a/jjb/music/music-prom.yaml +++ b/jjb/music/music-prom.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'music-prom-settings' files: '**' archive-artifacts: '' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index b5303c0ec..9f827e2a7 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -1,4 +1,10 @@ --- +- project: + name: music-project-view + project-name: music + views: + - project-view + - project: name: music project-name: 'music' @@ -14,8 +20,8 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' + - 'casablanca': + branch: 'casablanca' - 'dev-cassandra-only': branch: 'dev-cassandra-only' mvn-settings: 'music-settings' diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index ed428f62a..8e4b001b0 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -1,4 +1,10 @@ --- +- project: + name: oom-project-view + project-name: oom + views: + - project-view + - project: name: oomconfig project-name: 'oomconfig' diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index f2be369c0..165ce3d62 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -1,4 +1,10 @@ --- +- project: + name: oparent-project-view + project-name: oparent + views: + - project-view + - project: name: oparent project-name: 'oparent' @@ -10,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'oparent-settings' files: '**' archive-artifacts: '' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 77d797a71..5236e4381 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -1,4 +1,9 @@ --- +- project: + name: optf-project-view + project-name: optf + views: + - project-view - project: name: optf-cmso diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 77572e3c6..dd3551582 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -1,4 +1,10 @@ --- +- project: + name: policy-project-view + project-name: policy + views: + - project-view + - project: name: policy-apex-pdp project-name: 'policy-apex-pdp' @@ -42,7 +48,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true project: 'policy/apex-pdp' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 75175e6cf..3ae2b6eec 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -24,7 +24,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/common' stream: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index e51909896..0c14819b0 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -37,7 +37,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: false + disabled: true 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 c693a4e77..db78569ca 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -24,7 +24,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 7b8be216d..1ff637832 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -42,7 +42,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true project: 'policy/drools-pdp' stream: diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index d31267567..ec538d43a 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -42,7 +42,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true project: 'policy/engine' stream: diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index f3f1fbf0f..cc7da61a0 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -24,7 +24,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/parent' stream: diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 1b05ef0db..1f6db04a7 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -1,4 +1,10 @@ --- +- project: + name: portal-project-view + project-name: portal + views: + - project-view + - project: name: portal project-name: 'portal' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index c5d7261ff..33923c07f 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'sanity': trigger_jobs: '{project-name}-{stream}-sdc-merge-java' diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 595f86392..15f015754 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -1,4 +1,10 @@ --- +- project: + name: sdc-dcae-d-project-view + project-name: sdc-dcae-d + views: + - project-view + - project: name: sdc-dcae-d-ci project-name: 'sdc-dcae-d-ci' @@ -14,6 +20,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-ci-settings' files: '**' archive-artifacts: '' @@ -27,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/ci' project-name: 'sdc-dcae-d-ci' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-ci-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -39,5 +47,5 @@ - gerrit-maven-clm project: sdc/dcae-d/ci project-name: 'sdc-dcae-d-ci' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-ci-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 5d0f4b683..d83fda25b 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' files: '**' archive-artifacts: '' @@ -27,7 +29,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt-be-main' project-name: 'sdc-dcae-d-dt-be-main' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -39,5 +41,5 @@ - gerrit-maven-clm project: sdc/dcae-d/dt-be-main project-name: 'sdc-dcae-d-dt-be-main' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index 0e642dfff..734b9832e 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -10,6 +10,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' files: '**' archive-artifacts: '' @@ -23,7 +25,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt-be-property' project-name: 'sdc-dcae-d-dt-be-property' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -35,5 +37,5 @@ - gerrit-maven-clm project: sdc/dcae-d/dt-be-property project-name: 'sdc-dcae-d-dt-be-property' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 5e5183d5d..58369a1b9 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-settings' files: '**' archive-artifacts: '' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt' project-name: 'sdc-dcae-d-dt' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -41,5 +43,5 @@ project: sdc/dcae-d/dt project-name: 'sdc-dcae-d-dt' build-node: ubuntu1604-builder-4c-2g - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-settings' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index c869906b4..d8e6ebbc3 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-fe-settings' files: '**' archive-artifacts: '' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/fe' project-name: 'sdc-dcae-d-fe' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-fe-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -41,5 +43,5 @@ project: sdc/dcae-d/fe project-name: 'sdc-dcae-d-fe' build-node: ubuntu1604-builder-4c-2g - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-fe-settings' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index fa4e6516c..3242c407a 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' subproject: - dcae-d-tosca-lab: path: '.' @@ -27,7 +29,7 @@ build-node: ubuntu1604-docker-8c-8g project: 'sdc/dcae-d/tosca-lab' project-name: 'sdc-dcae-d-tosca-lab' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-dcae-d-tosca-lab-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 2ff77ed8c..07409c84a 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -1,4 +1,9 @@ --- +- project: + name: sdc-jtosca-project-view + project-name: sdc-jtosca + views: + - project-view - project: name: sdc-jtosca @@ -11,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' @@ -25,7 +32,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/jtosca' project-name: 'sdc-jtosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-jtosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -37,5 +44,5 @@ - gerrit-maven-clm project: sdc/jtosca project-name: 'sdc-jtosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-jtosca-settings' diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index f2632ac59..c897042e0 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -1,4 +1,10 @@ --- +- project: + name: sdc-onap-ui-project-view + project-name: sdc-onap-ui + views: + - project-view + - project: name: sdc-onap-ui-angular-info project-name: 'sdc-onap-ui-angular' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 4bf13dc52..18b2cc286 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -1,4 +1,9 @@ --- +- project: + name: sdc-sdc-distribution-project-view + project-name: sdc-sdc-distribution + views: + - project-view - project: name: sdc-sdc-distribution-client diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index c03e353a9..41a04440a 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index f94773a87..140953192 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-sdc-pubsub-settings' files: '**' archive-artifacts: '' @@ -31,7 +33,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-pubsub' project-name: 'sdc-sdc-pubsub' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-pubsub-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index 5b7d93730..354938aec 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -1,4 +1,9 @@ --- +- project: + name: sdc-sdc-titan-project-view + project-name: sdc-sdc-titan + views: + - project-view - project: name: sdc-sdc-titan-cassandra diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 4f0c301bc..f3fb95011 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -1,4 +1,9 @@ --- +- project: + name: sdc-sdc-tosca-project-view + project-name: sdc-sdc-tosca + views: + - project-view - project: name: sdc-sdc-tosca @@ -11,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' @@ -25,7 +32,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-tosca' project-name: 'sdc-sdc-tosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-tosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -37,5 +44,5 @@ - gerrit-maven-clm project: sdc/sdc-tosca project-name: 'sdc-sdc-tosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-tosca-settings' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index acb8e40cd..7fbf9f22d 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -1,4 +1,10 @@ --- +- project: + name: sdc-sdc-workflow-project-view + project-name: sdc-sdc-workflow + views: + - project-view + - project: name: sdc-sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' @@ -13,6 +19,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' @@ -29,7 +37,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-workflow-designer-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -42,5 +50,5 @@ project: sdc/sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' build-node: ubuntu1604-builder-4c-4g - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-workflow-designer-settings' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 14b106afa..b0e566bce 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -1,4 +1,27 @@ --- +- project: + name: sdc-master-project-view + project-name: sdc-master + views: + - project-view + +- project: + name: sdc-sdc-docker-project-view + project-name: sdc-sdc-docker + views: + - project-view + +- project: + name: sdc-maven-project-view + project-name: sdc-maven + views: + - project-view + +- project: + name: sdc-clm-project-view + project-name: sdc-clm + views: + - project-view - project: name: sdc @@ -20,6 +43,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' @@ -34,7 +59,7 @@ build-node: ubuntu1604-builder-8c-8g project: 'sdc' project-name: 'sdc' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' mvn-goals: 'clean install' @@ -50,5 +75,5 @@ project: sdc project-name: 'sdc' build-node: ubuntu1604-docker-8c-8g - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-settings' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 2f00a9ef5..082699461 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -1,4 +1,10 @@ --- +- project: + name: sdnc-project-view + project-name: sdnc + views: + - project-view + - project: name: sdnc-apps project-name: 'sdnc-apps' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 1af2778b0..8da349232 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -1,4 +1,9 @@ --- +- project: + name: so-project-view + project-name: so + views: + - project-view - project: name: so diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index f4a4652c8..030d8c5f8 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -1,4 +1,10 @@ --- +- project: + name: testsuite-project-view + project-name: testsuite + views: + - project-view + - project: name: testsuite project-name: 'testsuite' @@ -26,4 +32,6 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'testsuite-settings' diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml index 8ef0fdcc0..ee8effebc 100644 --- a/jjb/usecases/5G-bulkpm.yaml +++ b/jjb/usecases/5G-bulkpm.yaml @@ -5,10 +5,13 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'usecases' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - '5G-bulkpm': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' - robot-options: '' - branch: 'master' + robot-options: '' \ No newline at end of file diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 83a99e4cc..01e0c84a7 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -1,4 +1,9 @@ --- +- project: + name: usecase-ui-project-view + project-name: usecase-ui + views: + - project-view - project: name: usecase-ui diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index faf9d44ab..a2aa255c2 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -1,4 +1,9 @@ --- +- project: + name: vfc-project-view + project-name: vfc + views: + - project-view - project: name: vfc-gvnfm-vnflcm-java diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 7c4d5fcbc..dbe758052 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -1,4 +1,10 @@ --- +- project: + name: vid-project-view + project-name: vid + views: + - project-view + - project: name: vid project-name: 'vid' diff --git a/jjb/vnfrqts/vnfrqts-epics.yaml b/jjb/vnfrqts/vnfrqts-epics.yaml index 1e582a859..4c83e8f19 100644 --- a/jjb/vnfrqts/vnfrqts-epics.yaml +++ b/jjb/vnfrqts/vnfrqts-epics.yaml @@ -1,4 +1,10 @@ --- +- project: + name: vnfrqts-project-view + project-name: vnfrqts + views: + - project-view + - project: name: vnfrqts-epics project: 'vnfrqts/epics' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 0e391dfa8..7c75121c9 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -1,4 +1,10 @@ --- +- project: + name: vnfsdk-project-view + project-name: vnfsdk + views: + - project-view + - project: name: vnfsdk-dovetail-integration project-name: 'vnfsdk-dovetail-integration' diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml index 500819334..24444c8a1 100644 --- a/jjb/vvp/vvp-cms.yaml +++ b/jjb/vvp/vvp-cms.yaml @@ -1,4 +1,9 @@ --- +- project: + name: vvp-project-view + project-name: vvp + views: + - project-view - project: name: vvp-cms