Merge "Migrate gerrit-maven-stage (DCAEGEN)-2"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Mon, 8 Jul 2019 17:35:34 +0000 (17:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 8 Jul 2019 17:35:34 +0000 (17:35 +0000)
101 files changed:
Sandbox_Setup.md
global-jjb
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-cacher.yaml
jjb/aai/aai-chameleon.yaml
jjb/aai/aai-champ.yaml
jjb/aai/aai-data-router.yaml
jjb/aai/aai-esr-gui.yaml
jjb/aai/aai-esr-server.yaml
jjb/aai/aai-event-client.yaml
jjb/aai/aai-gallifrey.yaml
jjb/aai/aai-gizmo.yaml
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-router-core-service.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-search-data-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-spike.yaml
jjb/aai/aai-traversal.yaml
jjb/aai/aai-validation.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ci-management/ci-management-coverity.yaml
jjb/ci-management/ci-management-views.yaml
jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-kafka-docker.yaml
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-docker.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/dmaap/dmaap-zookeeper.yaml
jjb/integration/integration.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/kud-deployment.sh
jjb/oom/oom-helm.yaml
jjb/optf/optf-cmso-csit.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-has-csit.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf-csit.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-engine.yaml
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-xacml-pdp.yaml
jjb/sdc/sdc-csit.yaml
jjb/sdc/sdc-dcae-d-ci.yaml
jjb/sdc/sdc-dcae-d-csit.yaml [new file with mode: 0644]
jjb/sdc/sdc-dcae-d-dt-be-main.yaml
jjb/sdc/sdc-dcae-d-dt-be-property.yaml
jjb/sdc/sdc-dcae-d-dt.yaml
jjb/sdc/sdc-dcae-d-fe.yaml
jjb/sdc/sdc-dcae-d-tosca-lab.yaml
jjb/sdc/sdc-jtosca.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-pubsub.yaml
jjb/sdc/sdc-sdc-tosca.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/so/so-csit.yaml
jjb/so/so-libs.yaml
jjb/so/so.yaml
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/vid/vid.yaml
jjb/vnfsdk/vnfsdk-functest.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vnfsdk/vnfsdk-ves-agent.yaml
packer/provision/local-docker.yaml
shell/maven-coverity.sh

index abdc7c7..1ec8470 100644 (file)
@@ -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,
index 12853a4..ceaa770 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 12853a424496b5d87c355f32fa27604099a0edbb
+Subproject commit ceaa770aceb35242840d2718a0f8664143a8835f
index 20ddbae..3d75dde 100644 (file)
     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':
index 86e587d..dfda527 100644 (file)
     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':
index 3dc5d77..0947e87 100644 (file)
@@ -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':
index a0bd8f3..7ea108c 100644 (file)
     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':
index e583e85..5b4449e 100644 (file)
     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':
index fa6dea7..efd7409 100644 (file)
     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':
index a2920fe..98d9842 100644 (file)
     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':
index 5cee139..7d37d1c 100644 (file)
     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':
index 5b8efe5..8145631 100644 (file)
     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':
index ef82b0c..e4e5200 100644 (file)
@@ -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':
index 2f2c881..35aad1d 100644 (file)
     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':
index e44d769..d2ee0bf 100644 (file)
     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':
index b4383aa..6a9453e 100644 (file)
     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':
index e525772..10e8806 100644 (file)
     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':
index d5d5c2a..5470e30 100644 (file)
     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':
index 3136efe..1526dd3 100644 (file)
     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':
index 2816f3f..a76033d 100644 (file)
     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':
index 6868acf..20aea93 100644 (file)
     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':
index e5ae2e6..7bb29b7 100644 (file)
     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:
index be35736..046d1a1 100644 (file)
     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':
index c75d5bf..01bfcca 100644 (file)
@@ -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':
index 663240d..7f989a5 100644 (file)
     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':
index 8c64aa0..be4708d 100644 (file)
     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':
index c740de7..04c104b 100644 (file)
     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':
index 6995850..8053327 100644 (file)
@@ -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:
index 4217854..70c4edc 100644 (file)
@@ -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:
index a9ef4b4..0e6406f 100644 (file)
@@ -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:
index bdfa9a3..81a60a6 100644 (file)
@@ -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
 
 
index cbc35ea..9979e94 100644 (file)
@@ -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
 
 
index 3f17f54..2a34eb0 100644 (file)
@@ -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
 
 
index 73b9a12..7095c74 100644 (file)
@@ -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
 
 
index 81efcaf..958baf7 100644 (file)
@@ -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:
index 1d38ead..83bdffc 100644 (file)
     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
index 9dcbe47..91ca7b0 100644 (file)
     view-description: 'List of Verify jobs'
     view-regex: '^.*-verify-.*'
 
-- view:
+- project:
     name: WhiteSource
     views:
       - common-view
index 86759fe..5a75199 100644 (file)
@@ -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'
index a91af7a..a810fea 100644 (file)
           # 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:
index 13a5ec1..8de9d2b 100644 (file)
@@ -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
index 2c12df9..a342447 100644 (file)
@@ -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:
index 2420436..faf9afa 100644 (file)
     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:
index 2dce2c2..bc83e98 100644 (file)
           # 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:
index 5fd25b9..bd13919 100644 (file)
@@ -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:
index b6a9ac7..0de9ec3 100644 (file)
@@ -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':
index b5db723..bc171cb 100644 (file)
@@ -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':
index f2cf27a..f189c4e 100644 (file)
@@ -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':
index 828c1af..2f59b7a 100644 (file)
@@ -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':
index 91cde72..82077fa 100644 (file)
@@ -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':
index ba26428..69ab4d3 100644 (file)
@@ -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':
index de9855c..47c7f32 100644 (file)
           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':
index 714878e..401eecf 100644 (file)
@@ -5,44 +5,6 @@
     views:
       - 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
index 7529485..495b3cc 100644 (file)
     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'
index fe84a2c..054016d 100644 (file)
@@ -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'
index 5394ba1..5df6d07 100644 (file)
@@ -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:
index 732d618..8cfdbd4 100644 (file)
@@ -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:
index 937e6c3..a5cc39e 100644 (file)
@@ -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
index 5a7d377..1388620 100644 (file)
         #!/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}
index b655a67..ae0a790 100644 (file)
@@ -1,15 +1,17 @@
----\r
-- project:\r
-     name: optf-cmso-csit\r
-     jobs:\r
-       - '{project-name}-{stream}-verify-csit-{functionality}'\r
-       - '{project-name}-{stream}-csit-{functionality}'\r
-     project-name: 'optf-cmso'\r
-     stream:\r
-       - 'master':\r
-           branch: master\r
-     functionality:\r
-       - 'cmso':\r
-           trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'\r
-     robot-options: ''\r
-     branch: 'master'\r
+---
+- 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'
index 5b240f4..2c2b24d 100644 (file)
@@ -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:
index 08a03c3..4988786 100644 (file)
@@ -8,6 +8,8 @@
      stream:
        - 'master':
            branch: master
+       - 'dublin':
+           branch: dublin
      functionality:
        - 'has':
            trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily'
index 50a8035..238c96c 100644 (file)
@@ -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:
index c79a189..bb31f31 100644 (file)
@@ -8,6 +8,8 @@
      stream:
        - 'master':
            branch: master
+       - 'dublin':
+           branch: dublin
      functionality:
        - 'osdf':
            trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily'
index 0949850..14c7a17 100644 (file)
@@ -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:
index 9c9f562..d94bf4b 100644 (file)
          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':
     archive-artifacts: ''
     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:
index 6f0072c..24af5a9 100644 (file)
@@ -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'
     archive-artifacts: ''
     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:
index 2e99c97..2085e1a 100644 (file)
@@ -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:
     archive-artifacts: ''
     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:
index fe89f30..3e2aa14 100644 (file)
@@ -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:
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'drools-pdp'
     trigger_jobs:
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'drools-applications'
     trigger_jobs:
index e8a1681..c6950d2 100644 (file)
@@ -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:
     archive-artifacts: ''
     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:
index 6775406..1a4d1ff 100644 (file)
@@ -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':
     archive-artifacts: ''
     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:
index bc5d33d..478f281 100644 (file)
@@ -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'
     archive-artifacts: ''
     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:
index 8e18ba5..3c8a380 100644 (file)
@@ -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':
     archive-artifacts: ''
     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:
index 24b6866..1506dc5 100644 (file)
@@ -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':
     archive-artifacts: ''
     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:
index b9f6c78..b807d2d 100644 (file)
@@ -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
     archive-artifacts: ''
     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:
index 2867726..73727b0 100644 (file)
@@ -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'
     archive-artifacts: ''
     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:
index 7722b81..ff03067 100644 (file)
@@ -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:
     archive-artifacts: ''
     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:
index 05aea8e..feb9afe 100644 (file)
@@ -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:
     archive-artifacts: ''
     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:
index 7ec4294..1af6474 100644 (file)
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'sanity':
           trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
index 18146a2..52547b2 100644 (file)
@@ -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 (file)
index 0000000..e828e27
--- /dev/null
@@ -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: ''
index 1b896e0..70efc84 100644 (file)
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     files: '**'
     archive-artifacts: ''
index e203c5c..08044a1 100644 (file)
@@ -10,8 +10,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     files: '**'
     archive-artifacts: ''
index 03f0e88..ee6eec0 100644 (file)
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     files: '**'
     archive-artifacts: ''
index 8191aae..4f459d5 100644 (file)
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     files: '**'
     archive-artifacts: ''
index f6332ff..397b829 100644 (file)
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     subproject:
     - dcae-d-tosca-lab:
         path: '.'
index a36b758..bda26b7 100644 (file)
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
index 03b9d2a..273fda7 100644 (file)
@@ -12,8 +12,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
index 2930983..f94773a 100644 (file)
@@ -17,8 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     files: '**'
     archive-artifacts: ''
index 73662b9..f1ef58c 100644 (file)
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
index 7db82e5..b204229 100644 (file)
@@ -19,8 +19,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
index a164c54..a6e2dd5 100644 (file)
@@ -45,8 +45,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
index 47a8e7f..e4551d7 100644 (file)
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'integration-testing':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
index f39545d..9ad424b 100644 (file)
@@ -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:
index e69cb5b..781b94c 100644 (file)
     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'
index db8c90c..5cd6815 100644 (file)
@@ -11,7 +11,6 @@
       - 'robotframework-onap':
           tox-dir: robotframework-onap/
           tox-envs: ''
-
     stream:
       - 'master':
           branch: 'master'
     archive-artifacts: ''
     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:
index 3391fac..3a75eca 100644 (file)
@@ -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':
     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'
index f996394..1f7092e 100644 (file)
@@ -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'
index 0724f66..07e9dc8 100644 (file)
@@ -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'
index faa9e59..efd7555 100644 (file)
@@ -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:
index 866775b..0044317 100644 (file)
       - '{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':
index 8654b99..d38ff8f 100644 (file)
 
     - 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'
 
         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'
index e319b06..22a42c2 100644 (file)
@@ -19,6 +19,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
@@ -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