diff options
101 files changed, 544 insertions, 580 deletions
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index abdc7c73c..1ec847026 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -6,7 +6,7 @@ that can be used before pushing job templates to the production It is configured similar to the ONAP [ci-management] production instance; however, it cannot publish artifacts or vote in Gerrit. Be aware that this is a -test environment, and as such there a limited allotment of minions to test on +test environment, and as such there is a limited allotment of minions to test on before pushing code to the ONAP repos. Keep the following points in mind prior to beginning work on ONAP Jenkins Sandbox environment: @@ -19,11 +19,12 @@ environment: these VMs directly. Before you proceed further, ensure you have a Linux Foundation ID (LFID), which is -required to access Gerrit & Jenkins. Also, to get an access to Sandbox environment -please send email to helpdesk@onap.org (LF helpdesk team) +required to access Gerrit & Jenkins. Also, to extend your permissions for uploading +Jenkins configurations to Sandbox environment, you must raise a ticket to +[Linux Foundation Help Center](https://support.linuxfoundation.org) To download **ci-management**, execute the following command to clone the -**ci-managment** repository. +**ci-management** repository. `git clone https://gerrit.onap.org/r/ci-management && (cd ci-management && curl -Lo \ $(git rev-parse --git-dir)/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; \ @@ -48,28 +49,28 @@ jenkins-jobs --version jenkins-jobs test --recursive jjb/ ``` -### Make a copy of the example JJB config file (in the builder/ directory) +### Make a copy of the example JJB config file (in the ci-management/ directory) Backup the jenkins.ini.example to jenkins.ini `cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini` After copying the jenkins.ini.example, modify `jenkins.ini` with your -**Jenkins LFID username**, **API token** and **ONAP jenkins sandbox URL** +**Jenkins LFID username** and **API token** ``` [job_builder] ignore_cache=True keep_descriptions=False -include_path=.:scripts:~/git/ +include_path=. recursive=True +retain_anchors=True [jenkins] user=jwagantall <Provide your Jenkins Sandbox username> password= <Refer below steps to get API token> url=https://jenkins.onap.org/sandbox -This is deprecated, use job_builder section instead -ignore_cache=True +query_plugins_info=False ``` ### How to retrieve API token? Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user @@ -77,7 +78,7 @@ page by clicking on your username. Click **Configure** and then click **Add new After that specify a token name (optional) and click on **Generate** to generate and show new token. Please note down your token and store it securely. -To work on existing jobs or create new jobs, navigate to the `/jjb` directory where you +To work on existing jobs or create new jobs, navigate to the `ci-management/jjb/` directory where you will find all job templates for the project. Follow the below commands to test, update or delete jobs in your sandbox environment. @@ -105,7 +106,7 @@ The output directory will contain files with the XML configurations. ## To Update a job: -Ensure you’ve configured your `jenkins.ini` and verified it by +Ensure you’ve configured your `jenkins_jobs.ini` and verified it by outputting valid XML descriptions of Jenkins jobs. Upon successful verification, execute the following command to update the job to the Jenkins sandbox. @@ -114,6 +115,9 @@ Jenkins sandbox. **Example:** `jenkins-jobs update jjb/ sdc-master-verify-java` +Note that there will be some 403 errors along the way for failed view creation attempts even +when the job creation succeeds. + ## Trigger jobs from Jenkins Sandbox: Once you push the Jenkins job configuration to the ONAP Sandbox environment, diff --git a/global-jjb b/global-jjb -Subproject 12853a424496b5d87c355f32fa27604099a0edb +Subproject ceaa770aceb35242840d2718a0f8664143a8835 diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 20ddbae22..3d75dde0d 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/aai-common' stream: - 'master': diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 86e587dfb..dfda527de 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -11,11 +11,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/babel' stream: - 'dublin': diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 3dc5d77fe..0947e871d 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -5,12 +5,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/cacher' stream: - 'master': diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index a0bd8f3be..7ea108c83 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -11,11 +11,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'clean package dockerfile:build dockerfile:push' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/chameleon' stream: - 'dublin': diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index e583e85d5..5b4449e5c 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'champ-service/pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-f champ-service/pom.xml docker:build -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/champ' stream: - 'master': diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index fa6dea7f0..efd7409ce 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/data-router' stream: - 'dublin': diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index a2920fee5..98d9842cf 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -11,10 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/esr-gui' stream: - 'master': diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 5cee139eb..7d37d1cc1 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -11,10 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/esr-server' stream: - 'master': diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 5b8efe5cd..8145631af 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/event-client' stream: - 'dublin': diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index ef82b0c4c..e4e520050 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -5,11 +5,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'clean package dockerfile:build dockerfile:push' - build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/gallifrey' stream: - 'dublin': diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 2f2c88122..35aad1dbd 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/gizmo' stream: - 'dublin': diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index e44d76957..d2ee0bf07 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -11,12 +11,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/graphadmin' stream: - 'master': diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index b4383aad2..6a9453ebd 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/logging-service' stream: - 'dublin': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index e52577268..10e88067a 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/model-loader' stream: - 'dublin': diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index d5d5c2a7f..5470e3053 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -11,12 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'aai-resources/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/resources' stream: - 'master': diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 3136efedb..1526dd31c 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/rest-client' stream: - 'dublin': diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 2816f3f9e..a76033d70 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/router-core' stream: - 'dublin': diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 6868acfe8..20aea9375 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -11,12 +11,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'aai-schema-service/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/schema-service' stream: - 'master': diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index e5ae2e686..7bb29b7bd 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'search-data-service-app/pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' 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 be35736fd..046d1a1c1 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'sparkybe-onap-application/pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/sparky-be' stream: - 'dublin': diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index c75d5bf49..01bfccaed 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -6,7 +6,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/sparky-fe' stream: - 'dublin': diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index 663240d72..7f989a514 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/spike' stream: - 'dublin': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 8c64aa0fd..be4708d1f 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -11,12 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'aai-traversal/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/traversal' stream: - 'master': diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index c740de7e0..04c104b03 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/validation' stream: - 'dublin': diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 699585040..805332764 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -30,6 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -44,6 +45,7 @@ mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" - project: name: ccsdk-apps-clm @@ -58,6 +60,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -77,6 +80,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker + maven-version: "mvn35" build-node: queue-docker-4c-4g # #- project: diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 421785491..70c4edc2b 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -38,6 +39,7 @@ mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" - project: name: ccsdk-cds-clm @@ -52,6 +54,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-cds-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -71,6 +74,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker + maven-version: "mvn35" build-node: queue-docker-4c-4g - project: diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index a9ef4b494..0e6406fd5 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -38,6 +39,7 @@ mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" - project: name: ccsdk-features-clm @@ -52,6 +54,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-features-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index bdfa9a333..81a60a64c 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" - project: name: ccsdk-parent-clm @@ -38,6 +39,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-parent-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index cbc35eae6..9979e94a5 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -38,6 +39,7 @@ mvn-settings: 'ccsdk-sli-adaptors-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" - project: name: ccsdk-sli-adaptors-clm @@ -52,6 +54,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 3f17f54dc..2a34eb013 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -38,6 +39,7 @@ mvn-settings: 'ccsdk-sli-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" - project: name: ccsdk-sli-core-clm @@ -52,6 +54,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-core-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 73b9a125b..7095c741b 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -38,6 +39,7 @@ mvn-settings: 'ccsdk-sli-northbound-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" - project: name: ccsdk-sli-northbound-clm @@ -52,6 +54,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-northbound-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 81efcaf6a..958baf727 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" - project: name: ccsdk-sli-plugins-sonar @@ -37,6 +38,7 @@ mvn-settings: 'ccsdk-sli-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" - project: name: ccsdk-sli-plugins-clm @@ -51,6 +53,7 @@ - 'dublin': branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-settings' + maven-version: "mvn35" - project: diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml index 1d38ead72..83bdffc30 100644 --- a/jjb/ci-management/ci-management-coverity.yaml +++ b/jjb/ci-management/ci-management-coverity.yaml @@ -38,18 +38,22 @@ coverity-project-name: '' coverity-token: '' coverity-user-email: '' + coverity-search-paths: '' + coverity-search-exclude-regexs: '' stream: master submodule-recursive: true 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-log.txt + **/cov-int/BUILD.metrics.xml **/cov-int/build-timings.txt + **/cov-int/java-security-da-whitelist.dat properties: - lf-infra-properties: @@ -91,6 +95,8 @@ COVERITY_PROJECT_NAME={coverity-project-name} COVERITY_TOKEN={coverity-token} COVERITY_USER_EMAIL={coverity-user-email} + SEARCH_PATHS={coverity-search-paths} + SEARCH_EXCLUDE_REGEXS={coverity-search-exclude-regexs} - shell: !include-raw-escape: - ../../global-jjb/shell/common-variables.sh - ../../shell/maven-coverity.sh diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml index 9dcbe4783..91ca7b066 100644 --- a/jjb/ci-management/ci-management-views.yaml +++ b/jjb/ci-management/ci-management-views.yaml @@ -128,7 +128,7 @@ view-description: 'List of Verify jobs' view-regex: '^.*-verify-.*' -- view: +- project: name: WhiteSource views: - common-view diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml index 86759fe64..5a75199d2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml @@ -8,6 +8,14 @@ - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily': version-properties: 'blueprint-generator/version.properties' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + version-properties-file: 'blueprint-generator/version.properties' + mvn-pom: 'blueprint-generator/pom.xml' + mvn-params: '-f blueprint-generator/pom.xml' + pattern: 'blueprint-generator/**' subproject: - 'blueprint-gen': pom: 'blueprint-generator/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index a91af7a9b..a810feae2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -11,6 +11,15 @@ # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: centos7-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImage' project: 'dcaegen2/platform/servicechange-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 13a5ec142..8de9d2bc9 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,8 +6,10 @@ stream: - 'master': branch: 'master' + mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' - 'dublin': branch: 'dublin' + mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-version' # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' @@ -23,7 +25,6 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' script: '/bin/true' - gerrit-maven-stage: sign-artifacts: true diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 2c12df9f1..a3424473d 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -6,6 +6,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true project: 'dcaegen2/services/sdk' stream: diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 2420436b6..faf9afab3 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -11,16 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' -# -# see DMAAP-334 for more details, but -# - '{project-name}-{stream}-docker-java-daily': -# doesn't support mvn-goals override, so trying this... - - '{project-name}-{stream}-docker-java-shell-daily': + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g mvn-goals: 'clean package -P docker docker:build docker:push' - # No-op - script: '/bin/true' - build-node: 'ubuntu1604-docker-8c-8g' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/buscontroller' stream: diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 2dce2c243..bc83e988b 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -14,6 +14,15 @@ # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package -P docker docker:build docker:push' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/datarouter' stream: diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 5fd25b992..bd1391931 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -5,7 +5,11 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/dbcapi' mvn-settings: 'dmaap-dbcapi-settings' stream: diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml index b6a9ac75c..0de9ec3f2 100644 --- a/jjb/dmaap/dmaap-kafka-docker.yaml +++ b/jjb/dmaap/dmaap-kafka-docker.yaml @@ -8,6 +8,12 @@ mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/kafka11aaf' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index b5db723bc..bc171cbe1 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -6,6 +6,11 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/messagerouter/dmaapclient' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index f2cf27a2b..f189c4ecd 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -8,6 +8,12 @@ mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 828c1af93..2f59b7a54 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -6,6 +6,11 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 91cde72e6..82077fab2 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -6,6 +6,11 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/messagerouter/mirroragent' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index ba2642841..69ab4d375 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -6,6 +6,11 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/messagerouter/msgrtr' stream: - 'master': diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml index de9855ca3..47c7f3245 100644 --- a/jjb/dmaap/dmaap-zookeeper.yaml +++ b/jjb/dmaap/dmaap-zookeeper.yaml @@ -18,6 +18,12 @@ mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/zookeeper' stream: - 'master': diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 714878e4a..401eecf0b 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -6,44 +6,6 @@ - project-view - project: - name: integration - project-name: 'integration' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'version-manifest/pom.xml' - mvn-params: '-f version-manifest/pom.xml' - project: 'integration' - subproject: - - 'version-manifest': - pom: 'version-manifest/pom.xml' - pattern: 'version-manifest/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'integration-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: integration-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f version-manifest/pom.xml' - nexus-iq-namespace: 'onap-' - project: integration - project-name: 'integration' - stream: - - 'master': - branch: 'master' - mvn-settings: 'integration-settings' - -- project: name: integration-info project-name: integration jobs: diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 75294851b..495b3cc1c 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -11,6 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index fe84a2c81..054016d2b 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -5,6 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 5394ba135..5df6d07c4 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -5,6 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' project: 'msb/java-sdk' stream: diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 732d61897..8cfdbd419 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -5,6 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' project: 'msb/swagger-sdk' stream: diff --git a/jjb/multicloud/kud-deployment.sh b/jjb/multicloud/kud-deployment.sh index 937e6c3fc..a5cc39e47 100644 --- a/jjb/multicloud/kud-deployment.sh +++ b/jjb/multicloud/kud-deployment.sh @@ -1,8 +1,5 @@ -#!/usr/bin/env bash +#!/bin/bash -# setting-up bash flags set -x -e -o pipefail - -# run all-in-one deployment cd ./kud/ci -sudo bash -x ./kud-installer.sh +bash -x ./kud-installer.sh diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 5a7d377a1..13886207c 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -12,17 +12,21 @@ #!/bin/bash set -e -o pipefail cd kubernetes/ - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 + if [ "$GERRIT_BRANCH" != "staging" ]; then + if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then + echo "[ERROR] Only release images are allowed in helm charts." + exit 1 + fi fi make all subproject_build_script: | #!/bin/bash cd kubernetes/ - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 + if [ "$GERRIT_BRANCH" != "staging" ]; then + if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then + echo "[ERROR] Only release images are allowed in helm charts." + exit 1 + fi fi make common make {subproject} diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml index b655a6752..ae0a790e5 100644 --- a/jjb/optf/optf-cmso-csit.yaml +++ b/jjb/optf/optf-cmso-csit.yaml @@ -1,15 +1,17 @@ ----
-- 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'
+--- +- 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 + - 'dublin': + branch: dublin + 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 index 5b240f439..2c2b24ddf 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -30,6 +30,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-cmso-settings' subproject: - 'cmso': @@ -63,6 +65,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-cmso-settings' - project: diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 08a03c3d1..498878638 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'has': trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 50a8035f8..238c96cfa 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -32,6 +34,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -77,6 +81,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-has-settings' - project: diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml index c79a189a4..bb31f31dc 100644 --- a/jjb/optf/optf-osdf-csit.yaml +++ b/jjb/optf/optf-osdf-csit.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: master + - 'dublin': + branch: dublin functionality: - 'osdf': trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 094985082..14c7a17ec 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -31,6 +33,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -76,6 +80,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'optf-osdf-settings' - project: diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 9c9f562bc..d94bf4b7f 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -14,11 +14,17 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker' - disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'policy/apex-pdp' stream: - 'master': @@ -29,33 +35,6 @@ build-node: ubuntu1604-docker-8c-8g - project: - name: policy-apex-pdp-dublin - project-name: 'policy-apex-pdp-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false - build-node: ubuntu1604-docker-8c-8g - project: 'policy/apex-pdp' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-apex-pdp-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-apex-pdp-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 6f0072c83..24af5a950 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -8,19 +8,12 @@ docker-pom: 'pom.xml' mvn-params: '-P docker' build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: true - build-node: ubuntu1604-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -36,28 +29,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-api-dublin - project-name: 'policy-api-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: false - build-node: ubuntu1604-docker-8c-8g - - project: 'policy/api' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-api-settings' - -- project: name: policy-api-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 2e99c97e7..2085e1a89 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -9,8 +9,6 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-{stream}-release-version-java-daily': - disabled: true project: 'policy/common' stream: @@ -22,24 +20,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-common-dublin - project-name: 'policy-common-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: false - - project: 'policy/common' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-common-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-common-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index fe89f30f3..3e2aa14f5 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -7,8 +7,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'health' trigger_jobs: @@ -27,8 +25,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'apex-pdp' trigger_jobs: @@ -44,8 +40,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'distribution' trigger_jobs: @@ -61,8 +55,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'api' trigger_jobs: @@ -78,8 +70,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'xacml-pdp' trigger_jobs: @@ -95,8 +85,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'pap' trigger_jobs: @@ -112,8 +100,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'drools-pdp' trigger_jobs: @@ -129,8 +115,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'drools-applications' trigger_jobs: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index e8a16819b..c6950d274 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -8,12 +8,16 @@ docker-pom: 'pom.xml' mvn-params: '-P docker' build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'policy/distribution' stream: @@ -25,31 +29,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-distribution-dublin - project-name: 'policy-distribution-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: false - build-node: ubuntu1604-docker-8c-8g - - project: 'policy/distribution' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-distribution-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-distribution-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 677540647..1a4d1ff40 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -9,12 +9,12 @@ mvn-profile: 'docker' mvn-params: "-P docker" build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker' - disabled: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'policy/docker' stream: - 'master': @@ -25,31 +25,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-docker-base-common-dublin - project-name: 'policy-docker-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: "-P docker" - build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker' - disabled: false - build-node: ubuntu1604-docker-8c-8g - project: 'policy/docker' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-docker-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-docker-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index bc5d33dd2..478f28133 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -8,18 +8,12 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker' - disabled: true - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker' container-public-registry: 'nexus3.onap.org:10001' @@ -35,34 +29,6 @@ build-node: ubuntu1604-docker-8c-8g - project: - name: policy-drools-applications-dublin - project-name: 'policy-drools-applications-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'drools-apps-docker-merge.sh' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'drools-apps-docker-release.sh' - disabled: false - build-node: ubuntu1604-docker-8c-8g - - project: 'policy/drools-applications' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-drools-applications-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: name: policy-drools-applications-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 8e18ba557..3c8a38089 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -8,11 +8,17 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true mvn-params: '-P docker' - disabled: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'policy/drools-pdp' stream: - 'master': @@ -23,33 +29,6 @@ build-node: ubuntu1604-docker-8c-8g - project: - name: policy-drools-pdp-dublin - project-name: 'policy-drools-pdp-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false - build-node: ubuntu1604-docker-8c-8g - project: 'policy/drools-pdp' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-drools-pdp-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: name: policy-drools-pdp-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 24b686691..1506dc57e 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -8,11 +8,17 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker' - disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'policy/engine' stream: - 'master': @@ -23,33 +29,6 @@ build-node: 'ubuntu1604-docker-8c-8g' - project: - name: policy-engine-dublin - project-name: 'policy-engine-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - script: - !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false - build-node: ubuntu1604-docker-8c-8g - project: 'policy/engine' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-engine-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: name: policy-engine-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index b9f6c78cd..b807d2d61 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -5,8 +5,6 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: true - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -22,24 +20,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-models-dublin - project-name: 'policy-models-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: false - - project: 'policy/models' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-models-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-models-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 286772661..73727b0c8 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -8,19 +8,12 @@ docker-pom: 'pom.xml' mvn-params: '-P docker' build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: true - build-node: ubuntu1604-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -36,31 +29,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-pap-dublin - project-name: 'policy-pap-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: false - build-node: ubuntu1604-docker-8c-8g - - project: 'policy/pap' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-pap-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-pap-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 7722b81b2..ff0306719 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -9,8 +9,6 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-{stream}-release-version-java-daily': - disabled: true project: 'policy/parent' stream: @@ -22,24 +20,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-parent-dublin - project-name: 'policy-parent-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: false - - project: 'policy/parent' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-parent-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-parent-clm jobs: - gerrit-maven-clm diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 05aea8e32..feb9afe3a 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -8,12 +8,16 @@ docker-pom: 'pom.xml' mvn-params: '-P docker' build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: true + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'policy/xacml-pdp' stream: @@ -25,31 +29,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-xacml-pdp-dublin - project-name: 'policy-xacml-pdp-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - disabled: false - build-node: ubuntu1604-docker-8c-8g - - project: 'policy/xacml-pdp' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-xacml-pdp-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-xacml-pdp-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 7ec4294d7..1af647470 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' 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 18146a2f2..52547b224 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -21,8 +21,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-dcae-d-ci-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-csit.yaml b/jjb/sdc/sdc-dcae-d-csit.yaml new file mode 100644 index 000000000..e828e27e6 --- /dev/null +++ b/jjb/sdc/sdc-dcae-d-csit.yaml @@ -0,0 +1,19 @@ +--- +- project: + name: sdc-dcae-d-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'sdc-dcae-d' + stream: + - 'master': + branch: 'master' + functionality: + - 'dcaed': + trigger_jobs: + - 'sdc-{stream}-docker-version-java-daily' + - '{project-name}-dt-be-main-{stream}-docker-version-java-daily' + - '{project-name}-dt-{stream}-docker-version-java-daily' + - '{project-name}-fe-{stream}-docker-version-java-daily' + - '{project-name}-tosca-lab-{stream}-docker-java-daily' + robot-options: '' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 1b896e0bb..70efc8408 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index e203c5cf7..08044a1fb 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 03f0e889c..ee6eec04d 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-dcae-d-dt-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 8191aaee0..4f459d5f1 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-dcae-d-fe-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index f6332ff6e..397b82957 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' subproject: - dcae-d-tosca-lab: path: '.' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index a36b758be..bda26b76a 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 03b9d2abc..273fda71a 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -12,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' 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 2930983fc..f94773a87 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -17,8 +17,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-sdc-pubsub-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 73662b962..f1ef58c98 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 7db82e592..b20422991 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -19,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index a164c5411..a6e2dd58b 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -45,8 +45,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 47a8e7f01..e4551d77f 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' functionality: - 'integration-testing': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index f39545d26..9ad424bcc 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -5,6 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' project: 'so/libs' stream: diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index e69cb5b37..781b94c69 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -11,6 +11,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index db8c90c61..5cd681510 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -11,7 +11,6 @@ - 'robotframework-onap': tox-dir: robotframework-onap/ tox-envs: '' - stream: - 'master': branch: 'master' @@ -23,6 +22,24 @@ build-node: 'ubuntu1604-builder-4c-4g' - project: + name: testsuite-python-testing-utils-verify + project-name: 'testsuite-python-testing-utils' + project: 'testsuite/python-testing-utils' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'testsuite-python-testing-utils-settings' + build-node: 'ubuntu1604-builder-4c-4g' + subproject: + - 'robotframework-onap': + path: 'robotframework-onap' + pattern: 'robotframework-onap/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + +- project: name: testsuite-python-testing-utils-master-clm jobs: - gerrit-maven-clm diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 3391fac20..3a75eca5e 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -21,8 +21,6 @@ mvn-params: '-P docker' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-{stream}-release-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' project: 'vid' stream: - 'master': @@ -34,24 +32,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: vid-docker - project-name: 'vid' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - project: 'vid' - stream: - - 'master': - branch: 'master' - - 'dublin': - branch: 'dublin' - mvn-settings: 'vid-settings' - files: '**' - archive-artifacts: '' - build-node: queue-docker-4c-4g - #- project: # name: vid-docker-arm64 # project-name: 'vid-arm64' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index f99639469..1f7092eac 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -5,6 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' project: 'vnfsdk/functest' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 0724f6686..07e9dc829 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -5,6 +5,17 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-f vnfmarket-be/deployment/docker/docker-refrepo/pom.xml -P docker -Dmaven.test.skip=true' + mvn-pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index faa9e59ef..efd755543 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -5,6 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' project: 'vnfsdk/validation' stream: diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index 866775b2f..004431708 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -12,6 +12,13 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + mvn-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + pattern: 'veslibrary/**' project: 'vnfsdk/ves-agent' stream: - 'master': diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 8654b99d0..d38ff8f6d 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -152,7 +152,7 @@ - name: Install Erlang apt: - deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb + deb: https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb become: true when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' @@ -208,3 +208,10 @@ state: link become: true when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' + + - name: Install jinja2 + pip: + name: jinja2 + state: present + become: true + when: ansible_architecture == 'x86_64' diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh index e319b06d9..22a42c2d5 100644 --- a/shell/maven-coverity.sh +++ b/shell/maven-coverity.sh @@ -20,6 +20,25 @@ PS4='+['$(readlink -f "$0")' ${FUNCNAME[0]%main}#$LINENO] ' echo '---> maven-coverity.sh' #----------------------------------------------------------------------------- +# Process parameters for JS/PHP/Ruby 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}'" + 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 + +#----------------------------------------------------------------------------- # Check if we are allowed to submit results to Coverity Scan service # and have not exceeded our upload quota limits # See also: https://scan.coverity.com/faq#frequency @@ -96,8 +115,9 @@ rm 'coverity_tool.tgz' export MAVEN_OPTS -cov-build \ +eval cov-build \ --dir 'cov-int' \ + ${FS_CAPTURE_SEARCH_PARAMS} \ "${MVN}" clean install \ --errors \ --global-settings "${GLOBAL_SETTINGS_FILE}" \ @@ -109,6 +129,16 @@ cov-import-scm \ --dir 'cov-int' \ --scm 'git' +cov-manage-emit \ + --dir cov-int \ + list \ +| grep \ + --invert-match \ + '^Translation unit:$' \ +| sed \ + 's!^[[:digit:]]\+ -> !!' \ +> 'coverity-scan-analysed-files.log' + #----------------------------------------------------------------------------- # Submit results to Coverity service |