diff options
51 files changed, 176 insertions, 59 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 75a564bba..210ac11d1 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -14,6 +14,8 @@ - gerrit-maven-stage: build-node: ubuntu1604-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/aai-common' stream: - 'master': diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 6206deb8b..cab62d047 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -20,7 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/babel' stream: - 'elalto': diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 409402b68..fa5f487eb 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -14,7 +14,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/cacher' stream: - 'master': diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index 12f452ebe..031e3f0b2 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -20,7 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/chameleon' stream: - 'elalto': diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index 1a003e404..ac7a91118 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/champ' stream: - 'master': diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 8fb7826ed..357727522 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/data-router' stream: - 'elalto': diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 9577215e5..2c0df6f8a 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/esr-gui' stream: - 'master': diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index d648b6c48..695d3cc3f 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/esr-server' stream: - 'master': diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index bf1a3e150..4c373c011 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/event-client' stream: - 'elalto': diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index fabeade98..2a3593dce 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -14,6 +14,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/gallifrey' stream: - 'elalto': diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 6cefc63bd..9c18eb9c6 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/gizmo' stream: - 'elalto': diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index cee985251..5c08eea11 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -20,7 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/graphadmin' stream: - 'master': diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 278b1ee2b..fb6f87b99 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -17,7 +17,8 @@ mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/graphgraph' stream: - 'master': diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 4d70dea73..a15128d35 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/logging-service' stream: - 'elalto': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 40ab18f2e..152f01d15 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/model-loader' stream: - 'elalto': diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 4b345dfad..959d441dc 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/resources' stream: - 'master': diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 7dd3d5c0d..d2871b3c0 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/rest-client' stream: - 'elalto': diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index ee8401224..da8c56828 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/router-core' stream: - 'elalto': diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 78732a577..77a9c6f29 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -20,11 +20,14 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/schema-service' stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 2cb4cd05a..9a53e718c 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/search-data-service' docker-image-name: 'onap/search-data-service' stream: diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index aadf26f51..7e270003a 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/sparky-be' stream: - 'elalto': diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index d85fbbc8d..e17dcaf5e 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -9,6 +9,8 @@ - gerrit-maven-stage: build-node: ubuntu1604-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/sparky-fe' stream: - 'elalto': diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index d5a03baa7..ec5228a38 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/spike' stream: - 'elalto': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 9276f45b8..33934c680 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/traversal' stream: - 'master': diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index 54df8ddf9..779f91616 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -20,6 +20,8 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'aai/validation' stream: - 'elalto': diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml index 2fc39b86d..a561615ba 100644 --- a/jjb/ci-management/ci-management-coverity.yaml +++ b/jjb/ci-management/ci-management-coverity.yaml @@ -45,15 +45,17 @@ submodule-timeout: 10 submodule-disable: false archive-artifacts: > - **/*.log - **/*-log.txt - **/hs_err_*.log - **/target/**/feature.xml - **/target/failsafe-reports/failsafe-summary.xml - **/target/surefire-reports/*-output.txt - **/cov-int/BUILD.metrics.xml - **/cov-int/build-timings.txt - **/cov-int/java-security-da-whitelist.dat + cov-int/BUILD.metrics.xml + cov-int/build-log.txt + cov-int/build-timings.txt + cov-int/cov-import-scm-timings.txt + cov-int/failed_jsp/* + cov-int/java-security-da-input.dat + cov-int/java-security-da-whitelist.dat + cov-int/jsp-compilation-log.txt + cov-int/jsp-debug-log.txt + cov-int/security.log + coverity-scan-analysed-files.log properties: - lf-infra-properties: diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 778324c51..bbccbc2b9 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -18,6 +18,8 @@ - '{project-name}-{stream}-verify-java': - '{project-name}-{stream}-merge-java': mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g mvn-goals: 'clean deploy docker:build -DpushImage' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml index 2e2c9e32c..230df5e87 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml @@ -20,6 +20,8 @@ - '{project-name}-{stream}-verify-java': mvn-params: '-DskipTests=true' - '{project-name}-{stream}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index d1345485c..35ac5eea4 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'el-alto': + branch: 'el-alto' # apply to all jobs project: 'dcaegen2/collectors/datafile' mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index ed670f3de..716f29ff6 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -19,6 +19,8 @@ mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index b7f5204f0..2f80211ca 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -14,6 +14,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'dcaegen2/collectors/restconf' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 384982c6a..76efa4f85 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -14,6 +14,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'dcaegen2/collectors/ves' stream: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index f1943d43d..d8f4460af 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'el-alto': + branch: 'el-alto' 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-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml index 5e4e33e44..f378ea0f8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml @@ -6,6 +6,8 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 4b161fbc1..e8cfdaf23 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'el-alto': + branch: 'el-alto' 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 8f2c351c7..77c4efc08 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' + - 'el-alto': + branch: 'el-alto' 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 00ec8e3ec..45502a842 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -21,6 +21,8 @@ stream: - 'master': branch: 'master' + - 'el-alto': + branch: 'el-alto' 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-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index e53475293..3472d79f5 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -21,6 +21,9 @@ stream: - 'master': branch: 'master' + - 'el-alto': + branch: 'el-alto' + 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-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 41cb2f169..4fa3ff572 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -14,6 +14,8 @@ mvn-goals: 'clean package docker:build -DpushImage' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'dcaegen2/services/mapper' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index cbc56f160..83f047c21 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'el-alto': + branch: 'el-alto' # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index f5f9eddce..48591b610 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -14,6 +14,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImage' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'dcaegen2/services/prh' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index bd375a659..d0b00c02e 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -14,6 +14,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'dcaegen2/services/son-handler' stream: diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 574e17ee8..b758ba5a4 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -22,6 +22,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'externalapi/nbi' stream: - 'master': 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 ee0195112..0677cb027 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml @@ -9,6 +9,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: logging-analytics/pomba/pomba-audit-common stream: - 'master': diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 5ae882847..03aab824e 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -9,12 +9,12 @@ chmod 755 ./ocata/docker/*.* chmod 755 ./windriver/docker/*.* chmod 755 ./pike/docker/*.* chmod 755 ./starlingx/docker/*.* -chmod 755 ./lenovo/docker/*.* +#chmod 755 ./lenovo/docker/*.* chmod 755 ./fcaps/docker/*.* ./ocata/docker/build_image.sh ./windriver/docker/build_image.sh ./pike/docker/build_image.sh ./starlingx/docker/build_image.sh -./lenovo/docker/build_image.sh +#./lenovo/docker/build_image.sh ./fcaps/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 7a17cdb80..6fd0ccfb1 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -30,6 +30,8 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml new file mode 100644 index 000000000..859637ed2 --- /dev/null +++ b/jjb/multicloud/multicloud-framework.yaml @@ -0,0 +1,7 @@ +- project: + name: multicloud-framework-info + project-name: multicloud-framework + jobs: + - gerrit-info-yaml-verify + project: multicloud/framework + branch: master diff --git a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml index b97abdae1..92f21d2c6 100644 --- a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml @@ -1,13 +1,13 @@ ---
-- project:
- name: multicloud-openstack-lenovo-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'multicloud-lenovo'
- stream: 'master'
- functionality:
- - 'functionality1':
- trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
+#- project:
+# name: multicloud-openstack-lenovo-csit
+# jobs:
+# - '{project-name}-{stream}-verify-csit-{functionality}'
+# - '{project-name}-{stream}-csit-{functionality}'
+# project-name: 'multicloud-lenovo'
+# stream: 'master'
+# functionality:
+# - 'functionality1':
+# trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
+# robot-options: ''
+# branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index bc73f9d3e..78611fc97 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -50,14 +50,14 @@ path: 'fcaps' pattern: 'fcaps/**' pom: 'fcaps/pom.xml' - - 'lenovo': - path: 'lenovo' - pattern: 'lenovo/**' - pom: 'lenovo/pom.xml' - - 'lenovo_share': - path: 'lenovo' - pattern: 'share/**' - pom: 'lenovo/pom.xml' +# - 'lenovo': +# path: 'lenovo' +# pattern: 'lenovo/**' +# pom: 'lenovo/pom.xml' +# - 'lenovo_share': +# path: 'lenovo' +# pattern: 'share/**' +# pom: 'lenovo/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' @@ -73,6 +73,8 @@ maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g files: '**' archive-artifacts: '' build-node: 'centos7-memcached-4c-4g' @@ -176,19 +178,19 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- project: - name: multicloud-openstack-lenovo-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'multicloud/openstack' - project-name: 'multicloud-openstack-lenovo' - branch: 'master' - mvn-params: '-f lenovo/pom.xml' - mvn-settings: 'multicloud-openstack-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +#- project: +# name: multicloud-openstack-lenovo-sonar +# jobs: +# - gerrit-maven-sonar +# cron: '@daily' +# build-node: ubuntu1604-builder-4c-4g +# project: 'multicloud/openstack' +# project-name: 'multicloud-openstack-lenovo' +# branch: 'master' +# mvn-params: '-f lenovo/pom.xml' +# mvn-settings: 'multicloud-openstack-settings' +# mvn-goals: 'clean install' +# mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: name: multicloud-openstack-info diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index cc9522b12..d1f7217db 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -18,7 +18,7 @@ - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true - mvn-params: '-Dmaven.test.skip=true' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' project: 'so' diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh index f263963fe..51bd2733f 100644 --- a/shell/maven-coverity.sh +++ b/shell/maven-coverity.sh @@ -23,23 +23,29 @@ SUBMISSION_ATTEMPTS=5 SUBMISSION_INITIAL_REST_INTERVAL=30 # seconds, will be doubled after each attempt #----------------------------------------------------------------------------- -# Process parameters for JS/PHP/Ruby files analysis +# Process parameters for JS/TS/Python/Ruby/PHP files analysis -FS_CAPTURE_SEARCH_PARAMS='' if [ -n "${SEARCH_PATHS:=}" ]; then for SEARCH_PATH in ${SEARCH_PATHS}; do if [ -d "${SEARCH_PATH}" ]; then - FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search '${SEARCH_PATH}'" + FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS:=} --fs-capture-search '${SEARCH_PATH}'" else echo "'${SEARCH_PATH}' from \$SEARCH_PATHS is not an existing directory." >&2 exit 1 fi done -fi -for EXCLUDE_REGEX in ${SEARCH_EXCLUDE_REGEXS:=}; do - FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search-exclude-regex '${EXCLUDE_REGEX}'" -done + for EXCLUDE_REGEX in ${SEARCH_EXCLUDE_REGEXS:=}; do + EXCLUDE_REGEX=${EXCLUDE_REGEX//\'/\'\\\'\'} # escape single quote "'" + FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search-exclude-regex '${EXCLUDE_REGEX}'" + + # FIXME: a hack to deal with temporary(?) non-functional filter to ignore + # specific source code parts by Coverity Scan ("--fs-capture-search-exclude-regex" + # CLI parameter for "cov-build" tool). The hack can be removed when this CLI + # parameter is fixed on Coverity side. + FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS="${FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS:=} --tu-pattern 'file('\\''${EXCLUDE_REGEX}'\\'')'" + done +fi #----------------------------------------------------------------------------- # Check if we are allowed to submit results to Coverity Scan service @@ -120,7 +126,8 @@ export MAVEN_OPTS eval cov-build \ --dir 'cov-int' \ - ${FS_CAPTURE_SEARCH_PARAMS} \ + --append-log \ + ${FS_CAPTURE_SEARCH_PARAMS:=} \ "${MVN}" clean install \ --errors \ --global-settings "${GLOBAL_SETTINGS_FILE}" \ @@ -128,10 +135,23 @@ eval cov-build \ ${MAVEN_OPTIONS:=} \ ${MAVEN_PARAMS:=} +# FIXME: a hack to deal with temporary(?) non-functional filter to ignore +# specific source code parts by Coverity Scan ("--fs-capture-search-exclude-regex" +# CLI parameter for "cov-build" tool). The hack can be removed when this CLI +# parameter is fixed on Coverity side. +if [ -n "${FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS:=}" ]; then + eval cov-manage-emit \ + --dir 'cov-int' \ + ${FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS} \ + delete +fi + +# Extract git data for analysed files cov-import-scm \ --dir 'cov-int' \ --scm 'git' +# List all analysed files from the project cov-manage-emit \ --dir cov-int \ list \ @@ -140,6 +160,7 @@ cov-manage-emit \ '^Translation unit:$' \ | sed \ 's!^[[:digit:]]\+ -> !!' \ +| sort \ > 'coverity-scan-analysed-files.log' #----------------------------------------------------------------------------- |