Merge "Migrate to gerrit-maven-stage (MSB)"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Mon, 1 Jul 2019 17:30:24 +0000 (17:30 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 1 Jul 2019 17:30:24 +0000 (17:30 +0000)
212 files changed:
Sandbox_Setup.md
global-jjb
jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-sms.yaml
jjb/aaf/aaf-sshsm.yaml
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-graphgraph.yaml
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-oom.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/appc/appc-cdt.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/appc/appc-parent.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/ccsdk-csit.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/platform-plugins.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management-coverity.yaml [new file with mode: 0644]
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/ci-management/ci-management-views.yaml
jjb/clamp/clamp-csit.yaml
jjb/clamp/clamp.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-analytics-tca.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-plugins.yaml
jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-java.yaml
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dcaegen2/dcaegen2-services-son-handler.yaml
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/demo/demo.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter-csit.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-kafka-docker.yaml
jjb/dmaap/dmaap-kafka.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/doc/doc.yaml
jjb/externalapi/externalapi-nbi.yaml
jjb/global-defaults.yaml
jjb/global-templates-c.yaml
jjb/global-templates-docker.yaml
jjb/global-templates-helm.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/integration.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/modeling-toscaparsers-genericparser.yaml
jjb/modeling/modeling-toscaparsers-nfvparser.yaml
jjb/multicloud/kud-deployment.sh [new file with mode: 0644]
jjb/multicloud/multicloud-azure-java.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-k8s-kud-deployment.yaml [new file with mode: 0644]
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music-mdbc.yaml
jjb/music/music-prom.yaml
jjb/music/music.yaml
jjb/onap-jjb/onap-pypi-template.yaml
jjb/oom/include-yaml-check.sh [deleted file]
jjb/oom/offline-installer-review-bootstrap.sh [new file with mode: 0644]
jjb/oom/offline-installer.yaml
jjb/oom/oom-helm.yaml
jjb/oom/oom-jobs.yaml
jjb/oom/oom-registrator.yaml
jjb/optf/build-optf-fgps-docker-image.sh [new file with mode: 0644]
jjb/optf/optf-cmso.yaml
jjb/optf/optf-fgps-csit.yaml [new file with mode: 0644]
jjb/optf/optf-fgps.yaml [new file with mode: 0644]
jjb/optf/optf-has.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-be-common.yaml [new file with mode: 0644]
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/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/testsuite/testsuite-docker.sh
jjb/testsuite/testsuite-heatbridge-release.yaml [deleted file]
jjb/testsuite/testsuite-heatbridge.yaml [moved from jjb/testsuite/testsuite-heatbridge-master.yaml with 95% similarity]
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/testsuite/testsuite.yaml
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-nfvo-catalog.yaml
jjb/vfc/vfc-nfvo-db.yaml
jjb/vfc/vfc-nfvo-driver-ems-java.yaml
jjb/vfc/vfc-nfvo-driver-sfc.yaml
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-multivimproxy.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vid/vid-csit.yaml
jjb/vid/vid.yaml
jjb/vnfrqts/pre-build-needs.sh
packer/common-packer
packer/provision/local-docker.yaml
packer/vars/centos-7.json [deleted file]
shell/maven-coverity.sh [new file with mode: 0644]

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 bfea76c..ceaa770 160000 (submodule)
@@ -1 +1 @@
-Subproject commit bfea76c9bead88faf10a3ad41ae98ad741ac1b91
+Subproject commit ceaa770aceb35242840d2718a0f8664143a8835f
index 41440ff..1bd5189 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2
index dbabd5f..1fea53c 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
new file mode 100644 (file)
index 0000000..33e096f
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190610-221311.883
+LABELS=centos7-docker-8c-8g
+HARDWARE_ID=v2-highcpu-8
index 975b749..b8b74a8 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - redis - 20180805-2225
+IMAGE_NAME=CentOS 7 - redis -  - 100680606-6010
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4
index 22bc7c4..b3c72a2 100644 (file)
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1
index b000ff6..29b2cd0 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
 LABELS=ubuntu1604-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2
index 5bff88e..8780f95 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
 LABELS=ubuntu1604-builder-4c-2g
 HARDWARE_ID=v2-highcpu-4
index 30a7bcd..a01f336 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
 LABELS=ubuntu1604-builder-8c-8g
 HARDWARE_ID=v2-highcpu-8
index db219ca..637bf61 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190123-052615.439
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
index a3bdd73..c1d860e 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v1-standard-8
index f5b09e5..81f53c8 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - 20180807-1251
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm -  - 20190607-124834.118
 LABELS=ubuntu1604-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2
index 26bcf36..ce1244f 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - memcached - 20171102-0135
+IMAGE_NAME=Ubuntu 16.04 - memcached -  - 170580505-5004
 LABELS=ubuntu1604-memcached-4c-4g
 HARDWARE_ID=v2-highcpu-4
index 4cb7359..11e33c5 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-docker-8c-8g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-shell-daily':
           mvn-goals: 'clean install'
           settings: '{mvn-settings}'
index a605a81..7d61e58 100644 (file)
@@ -5,7 +5,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-docker-8c-8g
+          maven-versions-plugin: true
     project: 'aaf/cadi'
     stream:
       - 'master':
index 6341892..999fc03 100644 (file)
@@ -8,9 +8,12 @@
     jobs:
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-          pom:
-            'sms-client/java/pom.xml'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'sms-client/java/pom.xml'
+          mvn-params: '-f sms-client/java/pom.xml'
       - '{project-name}-{stream}-docker-golang-shell-daily':
           script:
             !include-raw-escape: 'build-sms-docker-image.sh'
index 6e4ab2e..31e7006 100644 (file)
@@ -5,10 +5,10 @@
     build-timeout: 120
     project: 'aaf/sshsm'
     jobs:
-      - '{project-name}-{stream}-verify-c':
+      - gerrit-verify-c:
          script:
             !include-raw-escape: 'build-sshsm.sh'
-      - '{project-name}-{stream}-docker-c-shell-daily':
+      - gerrit-docker-c-shell-daily:
          script:
             !include-raw-escape: 'build-sshsm-docker-images.sh'
     stream:
index 1f5d8cc..2a6b9a2 100644 (file)
       - '{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':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -47,8 +51,8 @@
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
 
index 6245489..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:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
@@ -48,8 +53,8 @@
     project: 'aai/babel'
     project-name: 'aai-babel'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
index fde02ce..3dc5d77 100644 (file)
@@ -15,8 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -45,8 +45,8 @@
     project: 'aai/cacher'
     project-name: 'aai-cacher'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 
index dbb60b9..a0bd8f3 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/chameleon'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-chameleon-settings'
@@ -35,8 +35,8 @@
     project: 'aai/chameleon'
     project-name: 'aai-chameleon'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-chameleon-settings'
 
 - project:
index 59d9580..e583e85 100644 (file)
@@ -20,8 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-champ-settings'
     files: '**'
     archive-artifacts: ''
@@ -48,8 +48,8 @@
     project: 'aai/champ'
     project-name: 'aai-champ'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-champ-settings'
 
 - project:
index eb7f5bb..fa6dea7 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/data-router'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-data-router-settings'
@@ -47,8 +47,8 @@
     project: 'aai/data-router'
     project-name: 'aai-data-router'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-data-router-settings'
 
 - project:
index 583e321..a2920fe 100644 (file)
@@ -19,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-esr-gui-settings'
     files: '**'
     archive-artifacts: ''
@@ -36,8 +36,8 @@
     project: 'aai/esr-gui'
     project-name: 'aai-esr-gui'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-esr-gui-settings'
 
 - project:
index 250969c..5cee139 100644 (file)
@@ -19,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-esr-server-settings'
     files: '**'
     archive-artifacts: ''
@@ -49,8 +49,8 @@
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-esr-server-settings'
 
 - project:
index 3ba2992..5b8efe5 100644 (file)
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/event-client'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-event-client-settings'
@@ -43,8 +43,8 @@
     project: 'aai/event-client'
     project-name: 'aai-event-client'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-event-client-settings'
 
 - project:
index 3f79530..ef82b0c 100644 (file)
@@ -12,8 +12,8 @@
           build-node: 'ubuntu1604-docker-8c-8g'
     project: 'aai/gallifrey'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-gallifrey-settings'
@@ -28,8 +28,8 @@
     project: 'aai/gallifrey'
     project-name: 'aai-gallifrey'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-gallifrey-settings'
 
 - project:
index 530def2..2f2c881 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/gizmo'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-gizmo-settings'
@@ -48,8 +48,8 @@
     project: 'aai/gizmo'
     project-name: 'aai-gizmo'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-gizmo-settings'
 
 - project:
index efab1a8..e44d769 100644 (file)
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -51,8 +51,8 @@
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
 
index b1b4c7a..278b1ee 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'
+          build-node: ubuntu1604-docker-8c-8g
+
     project: 'aai/graphgraph'
     stream:
       - 'master':
index 53fe21c..b4383aa 100644 (file)
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/logging-service'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
@@ -43,8 +43,8 @@
     project: 'aai/logging-service'
     project-name: 'aai-logging-service'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-logging-service-settings'
 
 - project:
index a459e50..e525772 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
@@ -48,8 +48,8 @@
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-model-loader-settings'
 
 - project:
index 816ecff..f8a0612 100644 (file)
@@ -19,6 +19,9 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+
     mvn-settings: 'aai-oom-settings'
     files: '**'
     archive-artifacts: ''
index 787b453..d5d5c2a 100644 (file)
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -51,8 +51,8 @@
     project: 'aai/resources'
     project-name: 'aai-resources'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
 
index bbb1574..3136efe 100644 (file)
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/rest-client'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
@@ -43,8 +43,8 @@
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-rest-client-settings'
 
 - project:
index e4d0745..2816f3f 100644 (file)
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/router-core'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-router-core-settings'
@@ -43,8 +43,8 @@
     project: 'aai/router-core'
     project-name: 'aai-router-core'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-router-core-settings'
 
 - project:
index 0203729..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':
@@ -49,8 +53,8 @@
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn35'
 
index fddc4da..e5ae2e6 100644 (file)
@@ -19,8 +19,8 @@
     project: 'aai/search-data-service'
     docker-image-name: 'onap/search-data-service'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
@@ -65,8 +65,8 @@
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-search-data-service-settings'
 
 - project:
index 4b3bc44..be35736 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
@@ -47,8 +47,8 @@
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-sparky-be-settings'
 
 - project:
index 596eeaf..c75d5bf 100644 (file)
@@ -9,8 +9,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/sparky-fe'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-fe-settings'
index ca8d585..663240d 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/spike'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-spike-settings'
@@ -47,8 +47,8 @@
     project: 'aai/spike'
     project-name: 'aai-spike'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-spike-settings'
 
 - project:
index 9927db5..8c64aa0 100644 (file)
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -51,8 +51,8 @@
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
 
index a5dd70b..c740de7 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/validation'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-validation-settings'
@@ -48,8 +48,8 @@
     project: 'aai/validation'
     project-name: 'aai-validation'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-validation-settings'
 
 
index bcd0c82..d66a902 100644 (file)
@@ -5,8 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'appc/cdt'
     stream:
index 0289ee4..220e3cf 100644 (file)
@@ -6,7 +6,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-docker-image-blessing'
 
index 56ce45b..71e3700 100644 (file)
@@ -7,7 +7,10 @@
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-merge-java':
           build-node: ubuntu1604-builder-8c-8g
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily':
           build-node: ubuntu1604-builder-8c-8g
 
index 032b8fd..efb25d0 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'appc/parent'
     stream:
index 9ee4277..6995850 100644 (file)
@@ -20,8 +20,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
@@ -57,8 +55,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
@@ -74,8 +70,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
index c97d193..40d7500 100644 (file)
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     functionality:
index ce8015e..ebadb2a 100644 (file)
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
@@ -34,8 +32,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
@@ -72,8 +68,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
       - gerrit-info-yaml-verify
     project: ccsdk/distribution
     branch: master
+
+- project:
+    name: ccsdk-distribution-whitesource
+    project-name: ccsdk-distribution
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-distribution-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/distribution
+    branch: master
index 3950c98..a9ef4b4 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-features-settings'
@@ -51,8 +49,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-features-settings'
index c0d576b..bdfa9a3 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-parent-settings'
@@ -37,8 +35,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-parent-settings'
index b024a7a..a375204 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
@@ -51,8 +49,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
index 1b3237f..cbc35ea 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
@@ -51,8 +49,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
index a3feadd..3f17f54 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-settings'
@@ -51,8 +49,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-settings'
index 66c753b..73b9a12 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-settings'
@@ -51,8 +49,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-settings'
index 290cb9b..81efcaf 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-settings'
@@ -50,8 +48,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-settings'
index 5c5e316..3d0651c 100644 (file)
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
@@ -37,8 +35,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
new file mode 100644 (file)
index 0000000..83bdffc
--- /dev/null
@@ -0,0 +1,117 @@
+---
+# Coverity Scan static analysis
+
+- job-template:
+    name: '{project-name}-coverity'
+    id: onap-gerrit-maven-coverity
+    description: >
+      <hr/>
+      <h2>How to access Coverity Scan static analysis results</h2>
+      <ol>
+        <li>Visit <a href="https://scan.coverity.com/projects/{coverity-project-name}">Coverity Scan
+          project page</a>.</li>
+        <li>If you have not been added to the project on Coverity Scan service yet:
+          <ol>
+            <li>Click on <a href="https://scan.coverity.com/memberships/new?project_id={coverity-project-name}">
+              Add me to project</a>.</li>
+            <li>Wait till the project administrators grant you appropriate permissions.</li>
+          </ol>
+        <li>Click on <a href="https://scan.coverity.com/projects/{coverity-project-name}/view_defects">
+          View Defects</a>.</li>
+      </ol>
+      <p>Please note that processing data takes some time. You will get an email when it's done.</p>
+      <hr/>
+
+    project-type: freestyle
+    node: '{build-node}'
+    branch: master
+    build-days-to-keep: 7
+    build-timeout: 60
+    cron: '@daily'
+    disabled: false
+    git-url: '$GIT_URL/$PROJECT'
+    java-version: openjdk8
+    mvn-global-settings: global-settings
+    mvn-opts: ''
+    mvn-params: ''
+    mvn-version: mvn35
+    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.metrics.xml
+      **/cov-int/build-timings.txt
+      **/cov-int/java-security-da-whitelist.dat
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          stream: '{stream}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    triggers:
+      - timed: '{obj:cron}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    builders:
+      - lf-infra-pre-build
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - lf-provide-maven-settings:
+          global-settings-file: global-settings
+          settings-file: '{mvn-settings}'
+      - inject:
+          properties-content: |
+            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
+      - lf-provide-maven-settings-cleanup
+
+    publishers:
+      - lf-infra-publish
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
+          refspec: $GERRIT_REFSPEC
+          branch: $GERRIT_BRANCH
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
+          choosing-strategy: default
index f4f46f3..44b80be 100644 (file)
@@ -32,6 +32,7 @@
     build-timeout: 90
 
     platforms:
+      - centos-7
       - ubuntu-16.04
       - ubuntu-16.04-arm64
     templates: docker
@@ -82,7 +83,6 @@
     build-node: centos7-builder-2c-1g
 
     platforms:
-      - centos-7
       - ubuntu-16.04
     templates: helm
 
index 8915a2c..91ca7b0 100644 (file)
     view-regex: '^(?=.*-sonar)(?!.*-no-sonar).*'
     view-description: 'List of Sonar jobs'
 
+- project:
+    name: All-Coverity
+    views:
+      - common-view
+    view-name: All-Coverity
+    view-regex: '.*-coverity'
+    view-description: 'List of Coverity jobs'
+
 - view:
     name: CLM
     description: 'List of CLM jobs'
     view-name: Verify-Jobs
     view-description: 'List of Verify jobs'
     view-regex: '^.*-verify-.*'
+
+- project:
+    name: WhiteSource
+    views:
+      - common-view
+    view-name: WhiteSource
+    view-description: 'List of WhiteSource jobs'
+    view-regex: '.*-whitesource-.*'
index d069aa5..3c25793 100644 (file)
@@ -8,8 +8,8 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'casablanca':
-              branch: 'casablanca'
+        - 'dublin':
+              branch: 'dublin'
     functionality:
       - 'APIs':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index b941a2c..901d844 100644 (file)
@@ -9,30 +9,28 @@
     name: clamp
     project-name: 'clamp'
     jobs:
+      - gerrit-maven-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
       - '{project-name}-{stream}-verify-java-checkstyle':
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DoSetVersion'
-         mvn_properties:
-          - docker.pull.registry=nexus3.onap.org:10001
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DoSetVersion'
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-Dmaven.test.skip=true'
-         maven-properties: |
-          clamp.registry=$
 
     project: 'clamp'
     stream:
         - 'master':
               branch: 'master'
-        - 'casablanca':
-              branch: 'casablanca'
+        - 'dublin':
+              branch: 'dublin'
     mvn-settings: 'clamp-settings'
     files: '**'
     archive-artifacts: ''
index 418ca65..dde942d 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:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-f deployment/docker/pom.xml'
+          mvn-pom: 'deployment/docker/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: 'deployment/docker/pom.xml'
index fc3522d..d32d4b9 100644 (file)
@@ -7,7 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
-
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
index 749d01e..7108503 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites':
           trigger_jobs:
index a328fd6..3a574a5 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
index 44faf9b..1be5726 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 0ef35e6..79dab04 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index eb7a8fd..d7bc964 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index f1943d4..5dee646 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 6d35e18..285d4e0 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
new file mode 100644 (file)
index 0000000..5a75199
--- /dev/null
@@ -0,0 +1,31 @@
+---
+- project:
+    name: dcaegen2-platform-cli-bp-gen
+    project: 'dcaegen2/platform/cli'
+    project-name: 'dcaegen2-platform-cli'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{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'
+          pattern: 'blueprint-generator/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cli-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
index 4b161fb..8f753b4 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 8f2c351..b6bb261 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 385274b..d33b745 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 489cb01..3d7e40e 100644 (file)
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'centos7-redis-4c-4g'
 
 - project:
     name: dcaegen2-platform-plugins-sonar
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: centos7-redis-4c-4g
     project: 'dcaegen2/platform/plugins'
     project-name: 'dcaegen2-platform-plugins'
     branch: 'master'
@@ -40,7 +40,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/plugins
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: centos7-redis-4c-4g
     project-name: 'dcaegen2-platform-plugins'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-plugins-settings'
       - gerrit-info-yaml-verify
     project: dcaegen2/platform/plugins
     branch: master
+
+#job added to retain dublin plugin build under ubuntu
+- project:
+    name: dcaegen2-platform-plugins-dublin
+    project-name: 'dcaegen2-platform-plugins'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/plugins'
+    stream:
+      - 'dublin':
+          branch: 'dublin'
+    mvn-settings: 'dcaegen2-platform-plugins-settings'
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
index a93fd57..cb19425 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
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 559370c..94e7e2e 100644 (file)
@@ -7,8 +7,10 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:
-            - 'dcaegen2-services-master-bbs-event-processor-merge-java'
+            - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java'
     robot-options: ''
index 670cbd8..2e49ee5 100644 (file)
@@ -6,7 +6,8 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
+            version-properties: 'components/bbs-event-processor/version.properties'
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'
@@ -14,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
index 2d89736..1c5ad80 100644 (file)
@@ -6,7 +6,8 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
+            version-properties: 'components/datalake-handler/version.properties'
     subproject:
       - 'datalake-handler':
           pom: 'components/datalake-handler/pom.xml'
index ff7f9ae..3527ffd 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index dc04759..525a9fa 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services'
     branch: 'master'
index c5fc0d4..e319e68 100644 (file)
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
index 70302c1..7f9c4da 100644 (file)
@@ -6,6 +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'
@@ -21,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'
 
 - project:
index 38216d1..1d4bcf2 100644 (file)
@@ -4,7 +4,12 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-pmmapper'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+
     functionality:
       - 'pmmapper':
           trigger_jobs:
index b49c360..8e3047f 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
index 1c91870..a342447 100644 (file)
@@ -6,11 +6,17 @@
       - '{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:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
index 0e637f3..b4d2b5c 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
index 4e579b6..d91b378 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-utils-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 2d11c7f..4c610e1 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites'
     trigger_jobs:
@@ -21,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'prh-testsuites'
     trigger_jobs:
index 9987f57..38e683d 100644 (file)
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index f40d7ab..d866247 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: 'demo'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''
index 2420436..f43e43a 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 -DpushImage'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
 
     project: 'dmaap/buscontroller'
     stream:
index e1cabcf..f01af31 100644 (file)
@@ -10,6 +10,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'dr-suite':
           trigger_jobs:
@@ -25,6 +27,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'ssl-dr-suite':
           trigger_jobs:
index ac8aade..ba7cb67 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 -DpushImage'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
 
     project: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
index 5fd25b9..fd4ca6a 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/dbcapi'
     mvn-settings: 'dmaap-dbcapi-settings'
     stream:
index b6a9ac7..ba433f7 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-goals: '-Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/kafka11aaf'
     stream:
       - 'master':
index 7b1573c..85c5f74 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-docker-8c-8g
+          maven-versions-plugin: true
     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..30d6866 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-goals: '-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..77416d1 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-goals: '-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 e06166a..5ae9f73 100644 (file)
@@ -10,7 +10,7 @@
     project-name: 'doc'
     jobs:
       - '{project-name}-{stream}-verify-rtd':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - '{project-name}-{stream}-merge-rtd'
 
     project: 'doc'
@@ -25,6 +25,8 @@
           branch: 'beijing'
       - casablanca:
           branch: 'casablanca'
+      - dublin:
+          branch: 'dublin'
 
 - project:
     name: doc-info
index d3021cc..574e17e 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
     project: 'externalapi/nbi'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'externalapi-nbi-settings'
     files: '**'
     archive-artifacts: ''
@@ -55,8 +58,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'externalapi-nbi-settings'
 
 - project:
@@ -67,7 +68,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'externalapi/nbi'
     project-name: 'externalapi-nbi'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e43a8a2..b86e653 100644 (file)
@@ -47,6 +47,7 @@
 
     # git submodule attributes
     submodule-recursive: true
+    submodule-disable: false
 
     # Jenkins
     jenkins-ssh-credential: onap-jenkins-ssh
index 9f9bdf9..38a06ce 100644 (file)
@@ -1,40 +1,67 @@
 ---
-# vim: sw=2 ts=2 sts=2 et :
+####################
+# COMMON FUNCTIONS #
+####################
 
-- job-template:
-    #
-    # job template for build C/C++ project
-    #
-    # Required Variables:
-    #   script:         build script to execute
-    #
+- c_job_common: &c_job_common
+    name: c-job-common
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    submodule-recursive: true
+    submodule-disable: false
+    submodule-timeout: 10
+
+    #####################
+    # Job Configuration #
+    #####################
 
-    name: '{project-name}-{stream}-verify-c'
     project-type: freestyle
     node: '{build-node}'
+    disabled: false
 
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - infra-parameters:
+      - lf-infra-parameters:
           project: '{project}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
+          stream: '{stream}'
 
     scm:
-      - gerrit-trigger-scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '$GIT_URL/$PROJECT'
           refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
+          branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-disable: '{submodule-disable}'
+          submodule-timeout: '{submodule-timeout}'
+          choosing-strategy: default
 
     wrappers:
-      - infra-wrappers:
+      - lf-infra-wrappers:
           build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    #
+    # job template for build C/C++ project
+    #
+    # Required Variables:
+    #   script:         build script to execute
+    #
+    name: '{project-name}-{stream}-verify-c'
+    id: gerrit-verify-c
+    <<: *c_job_common
 
     triggers:
       - gerrit-trigger-patch-submitted:
       - lf-infra-pre-build
       - shell: '{script}'
 
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
 - job-template:
     # Job template for building & pushing docker images
     #
     #  1. login to the docker registry
     #  2. run a specified shell builder
     #
-
     name: '{project-name}-{stream}-docker-c-shell-daily'
-    project-type: freestyle
+    id: gerrit-docker-c-shell-daily
+    <<: *c_job_common
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
 
     triggers:
       # 12 AM UTC
       - docker-login
       - shell: '{script}'
 
+- job-template:
+    #
+    # job template for build project executed every 6hrs
+    #
+    # Required Variables:
+    #   script:         build script to execute
+    name: '{name}-{stream}-shell-6hrs'
+    node: '{build-node}'
+    type: freestyle
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: '{project}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          submodule-recursive: '{submodule-recursive}'
+          choosing-strategy: 'gerrit'
+
+    triggers:
+      - timed: '00 */6 * * *'
+
+    builders:
+      - shell: '{script}'
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
index db3d4cf..1c8242f 100644 (file)
@@ -24,6 +24,7 @@
     # Default to LF standard 'snapshots' docker registry
     docker_registry: '$DOCKER_REGISTRY:10003'
     docker_tag: 'latest'
+    submodule-disable: false
     submodule-timeout: 10
 
     #####################
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
index f5c6bcd..12ce9a3 100644 (file)
@@ -17,6 +17,7 @@
     git-url: '$GIT_URL/$PROJECT'
     post_build_script: ''
     pre_build_script: ''
+    submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
 
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     triggers:
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     triggers:
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
index 517643e..11b90ae 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: 'holmes/common'
     stream:
index 06315de..0279d4e 100644 (file)
@@ -5,7 +5,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-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
index 089a55f..df26710 100644 (file)
@@ -5,7 +5,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-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
index 6ed067e..401eecf 100644 (file)
@@ -5,39 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: integration
-    project-name: 'integration'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-    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 bf27f50..2dd843f 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-daily':
           docker-pom: 'pom.xml'
index 43c4afc..2fbfff6 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: logging-analytics/pomba/pomba-audit-common
     stream:
index 6f2238a..091b9a4 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-daily':
           docker-pom: 'pom.xml'
index 15b1a42..f41625f 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-daily':
           docker-pom: 'pom.xml'
index 71fbb33..5bc97bb 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-daily':
           docker-pom: 'pom.xml'
index 3feabec..cd1d05c 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-daily':
           docker-pom: 'pom.xml'
index 0e5919f..95de71c 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-version-java-daily':
           docker-pom: 'pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
     files: '**'
index f21e60c..88ab332 100644 (file)
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 1e65aa8..4ff6b3d 100644 (file)
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'nfvparser/pom.xml'
+          mvn-params: '-f nfvparser/pom.xml'
 
 - project:
     name: modeling-toscaparsers-nfvparser-sonar
diff --git a/jjb/multicloud/kud-deployment.sh b/jjb/multicloud/kud-deployment.sh
new file mode 100644 (file)
index 0000000..a5cc39e
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -x -e -o pipefail
+cd ./kud/ci
+bash -x ./kud-installer.sh
index 10c8d3e..b90b929 100644 (file)
       - '{project-name}-{stream}-merge-java'
       - '{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
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
index 14ebfc3..c2b72cf 100644 (file)
           pom: 'artifactbroker/pom.xml'
           pattern: 'artifactbroker/**'
     jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
diff --git a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml
new file mode 100644 (file)
index 0000000..d533464
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+    name: multicloud-k8s-kud-deployment
+    project: 'multicloud/k8s'
+    build-node: ubuntu1604-builder-4c-4g
+    kud_build_script: !include-raw-escape: kud-deployment.sh
+
+    stream:
+      - 'master':
+          branch: 'master'
+
+    jobs:
+      - '{name}-{stream}-shell-6hrs':
+          script: '{kud_build_script}'
+
index 8a1ec57..40c79e6 100644 (file)
       - '{project-name}-{stream}-merge-java'
       - '{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
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
index 972535e..0066522 100644 (file)
     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
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
index c9151f7..9947419 100644 (file)
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{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
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
index cd0e246..273efcf 100644 (file)
@@ -9,7 +9,6 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
     project: 'music/mdbc'
     stream:
       - 'master':
index ba30057..0349f9b 100644 (file)
@@ -9,12 +9,12 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: docker
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
     project: 'music/prom'
     stream:
       - 'master':
index 1f05ce8..a69bb7e 100644 (file)
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: docker
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+      - gerrit-maven-docker-stage:
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
     project: 'music'
     stream:
       - 'master':
index e526603..9de048c 100644 (file)
@@ -20,6 +20,7 @@
       - compare-type: ANT
         pattern: '**'
 
+    submodule-disable: false
     submodule-timeout: 10
 
     #####################
@@ -52,6 +53,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     wrappers:
diff --git a/jjb/oom/include-yaml-check.sh b/jjb/oom/include-yaml-check.sh
deleted file mode 100755 (executable)
index 27359e5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# setting-up bash flags
-set -x -e -o pipefail
-
-# remove old ansible - current centos build minion
-# is quite old and using incompatible ansible 2.4.x
-sudo yum -y remove ansible
-sudo pip install ansible ansible-lint
-
-# perform check
-ansible --version
-ansible-lint --version
-ansible-lint ./ansible/site.yml -vvv
diff --git a/jjb/oom/offline-installer-review-bootstrap.sh b/jjb/oom/offline-installer-review-bootstrap.sh
new file mode 100644 (file)
index 0000000..f8454d2
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# setting-up bash flags
+set -x -e -o pipefail
+
+#Run review script
+./offline-installer-review.sh
+
index ca2f15f..7e462d2 100644 (file)
@@ -2,13 +2,13 @@
 - project:
     name: offline-installer
     project-name: 'offline-installer'
-    build-node: centos7-builder-2c-1g
-    offline_build_script: !include-raw-escape: include-yaml-check.sh
+    build-node: 'ubuntu1604-docker-8c-8g'
+    offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
 
     stream:
       - 'master':
           branch: 'master'
 
     jobs:
-      - '{project-name}-{stream}-yaml-lint':
-          build_script: '{offline_build_script}'
+      - '{project-name}-{stream}-review':
+          build_script: '{offline_review_bootstrap}'
index 43ae807..1388620 100644 (file)
         #!/bin/bash
         set -e -o pipefail
         cd kubernetes/
+        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 [ "$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}
     oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
index 02eae3f..5f95f70 100644 (file)
@@ -1,8 +1,8 @@
 ---
 - job-template:
-    name: '{project-name}-{stream}-yaml-lint'
+    name: '{project-name}-{stream}-review'
     node: '{build-node}'
-    type: freestyle
+    project-type: freestyle
     build_script: ''
     pattern: '**'
 
index 08380da..5dc9d30 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'
diff --git a/jjb/optf/build-optf-fgps-docker-image.sh b/jjb/optf/build-optf-fgps-docker-image.sh
new file mode 100644 (file)
index 0000000..6c93c8b
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./*.*
+
+./build-dockers.sh
index 5de8fae..5b240f4 100644 (file)
@@ -10,8 +10,6 @@
     project-name: 'optf-cmso'
     jobs:
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-{stream}-verify-java-checkstyle':
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DoSetVersion'
-         mvn_properties:
-          - docker.pull.registry=nexus3.onap.org:10001
       - '{project-name}-{stream}-docker-java-properties-daily':
          setVersion: 'DoSetVersion'
          docker-pom: 'pom.xml'
diff --git a/jjb/optf/optf-fgps-csit.yaml b/jjb/optf/optf-fgps-csit.yaml
new file mode 100644 (file)
index 0000000..a60c453
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+     name: optf-fgps-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'optf-fgps'
+     stream:
+       - 'master':
+           branch: master
+     functionality:
+       - 'fgps':
+           trigger_jobs: 'optf-fgps-master-docker-java-version-shell-daily'
+     robot-options: ''
+     branch: 'master'
diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
new file mode 100644 (file)
index 0000000..110d1ec
--- /dev/null
@@ -0,0 +1,92 @@
+---
+- project:
+    name: optf-fgps
+    project-name: 'optf-fgps'
+    project: 'optf/fgps'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-fgps-settings'
+    subproject:
+      - 'valetapi':
+          path: 'valetapi'
+          pattern: 'valetapi/**'
+          pom: 'pom.xml'
+      - 'engine':
+          path: 'engine'
+          pattern: 'engine/**'
+          pom: 'pom.xml'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-builder-4c-4g'
+
+- project:
+    name: optf-fgps-docker
+    project-name: 'optf-fgps'
+    project: 'optf/fgps'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-fgps-settings'
+    subproject:
+      - 'valetapi':
+          path: 'valetapi'
+          pattern: 'valetapi/**'
+          pom: 'pom.xml'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
+          script:
+            !include-raw-escape: 'build-optf-fgps-docker-image.sh'
+          build-node: queue-docker-4c-4g
+      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
+          script:
+            !include-raw-escape: 'build-optf-fgps-docker-image.sh'
+          build-node: queue-docker-4c-4g
+
+- project:
+    name: optf-fgps-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'optf/fgps'
+    project-name: 'optf-fgps'
+    branch: 'master'
+    mvn-settings: 'optf-fgps-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-fgps-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: optf/fgps
+    project-name: 'optf-fgps'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-fgps-settings'
+
+- project:
+    name: optf-fgps-info
+    project-name: optf-fgps
+    jobs:
+      - gerrit-info-yaml-verify
+    project: optf/fgps
+    branch: master
index 3329bcd..50a8035 100644 (file)
@@ -19,9 +19,8 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
index 141f2bc..0949850 100644 (file)
@@ -18,9 +18,8 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
index f23b9c1..10ef69d 100644 (file)
     project-name: 'policy-apex-pdp'
     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
+      - '{project-name}-{stream}-merge-java':
+         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':
     mvn-settings: 'policy-apex-pdp-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
-    name: policy-apex-pdp-casablanca
-    project-name: 'policy-apex-pdp-casablanca'
+    name: policy-apex-pdp-dublin
+    project-name: 'policy-apex-pdp-dublin'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-scm-mvn-script':
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/apex-pdp'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-apex-pdp-settings'
     files: '**'
     archive-artifacts: ''
index 9462909..8038cb3 100644 (file)
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
+          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:
           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/api'
     stream:
     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 ccf6c75..2e99c97 100644 (file)
@@ -5,8 +5,12 @@
     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':
-          disabled: false
+          disabled: true
 
     project: 'policy/common'
     stream:
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
-    name: policy-common-casablanca
-    project-name: 'policy-common-casablanca'
+    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: true
+          disabled: false
 
     project: 'policy/common'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-common-settings'
     files: '**'
     archive-artifacts: ''
index cedbc64..fe89f30 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'health'
     trigger_jobs:
@@ -15,7 +17,6 @@
       - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
     build-timeout: 40
-    branch: 'master'
 
 - project:
     name: policy-apex-pdp-csit
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'apex-pdp'
     trigger_jobs:
       - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-distribution-csit
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'distribution'
     trigger_jobs:
       - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-api-csit
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'api'
     trigger_jobs:
       - 'policy-api-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-xacml-pdp-csit
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
       - 'policy-xacml-pdp-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-pap-csit
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'pap'
     trigger_jobs:
       - 'policy-pap-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-drools-pdp-csit
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'drools-pdp'
     trigger_jobs:
       - 'policy-drools-pdp-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-drools-applications-csit
     stream:
       - 'master':
           branch: master
+      - 'dublin':
+          branch: dublin
     functionality:
       - 'drools-applications'
     trigger_jobs:
       - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
index 6c5753c..e8a1681 100644 (file)
@@ -12,7 +12,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'
@@ -25,8 +25,8 @@
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
-    name: policy-distribution-casablanca
-    project-name: 'policy-distribution-casablanca'
+    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-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-distribution-settings'
     files: '**'
     archive-artifacts: ''
index c378217..0e77931 100644 (file)
@@ -2,6 +2,31 @@
 - project:
     name: policy-docker-base-common
     project-name: 'policy-docker'
+    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
+      - 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':
+          branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+    files: '**'
+    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':
@@ -17,8 +42,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/docker'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
index bab2c2e..bc5d33d 100644 (file)
@@ -4,19 +4,26 @@
     project-name: 'policy-drools-applications'
     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':
+      - '{project-name}-{stream}-merge-java':
           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
+          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
+          maven-versions-plugin: true
+          mvn-params: '-P docker'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
 
     project: 'policy/drools-applications'
     stream:
     mvn-settings: 'policy-drools-applications-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
-    name: policy-drools-applications-casablanca
-    project-name: 'policy-drools-applications-casablanca'
+    name: policy-drools-applications-dublin
+    project-name: 'policy-drools-applications-dublin'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{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:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-drools-applications-settings'
     files: '**'
     archive-artifacts: ''
index c7ab5c2..b0ded4a 100644 (file)
@@ -4,19 +4,26 @@
     project-name: 'policy-drools-pdp'
     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':
+      - '{project-name}-{stream}-merge-java':
           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
+          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/drools-pdp'
     stream:
       - 'master':
     mvn-settings: 'policy-drools-pdp-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
-    name: policy-drools-pdp-casablanca
-    project-name: 'policy-drools-pdp-casablanca'
+    name: policy-drools-pdp-dublin
+    project-name: 'policy-drools-pdp-dublin'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-scm-mvn-script':
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/drools-pdp'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-drools-pdp-settings'
     files: '**'
     archive-artifacts: ''
index 114adb7..ab7b8aa 100644 (file)
@@ -4,19 +4,26 @@
     project-name: 'policy-engine'
     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
+      - '{project-name}-{stream}-merge-java':
+         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':
     mvn-settings: 'policy-engine-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1604-docker-8c-8g'
 
 - project:
-    name: policy-engine-casablanca
-    project-name: 'policy-engine-casablanca'
+    name: policy-engine-dublin
+    project-name: 'policy-engine-dublin'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-scm-mvn-script':
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/engine'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-engine-settings'
     files: '**'
     archive-artifacts: ''
index b7507ab..b9f6c78 100644 (file)
@@ -6,7 +6,11 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
+          disabled: true
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
 
     project: 'policy/models'
     stream:
     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 e33bb23..8a6666b 100644 (file)
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
+          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:
           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/pap'
     stream:
     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 22c1edf..7722b81 100644 (file)
@@ -5,8 +5,12 @@
     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':
-          disabled: false
+          disabled: true
 
     project: 'policy/parent'
     stream:
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
-    name: policy-parent-casablanca
-    project-name: 'policy-parent-casablanca'
+    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: true
+          disabled: false
 
     project: 'policy/parent'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'policy-parent-settings'
     files: '**'
     archive-artifacts: ''
index 1ad7b7a..e50db07 100644 (file)
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
+          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:
           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 1af6474..7ec4294 100644 (file)
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'sanity':
           trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
index 52547b2..18146a2 100644 (file)
@@ -21,6 +21,8 @@
     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 70efc84..1b896e0 100644 (file)
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     files: '**'
     archive-artifacts: ''
index 08044a1..e203c5c 100644 (file)
@@ -10,6 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     files: '**'
     archive-artifacts: ''
index ee6eec0..03f0e88 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     files: '**'
     archive-artifacts: ''
index 4f459d5..8191aae 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     files: '**'
     archive-artifacts: ''
index 397b829..f6332ff 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     subproject:
     - dcae-d-tosca-lab:
         path: '.'
index bda26b7..a36b758 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
new file mode 100644 (file)
index 0000000..5e48a60
--- /dev/null
@@ -0,0 +1,55 @@
+---
+- project:
+    name: sdc-sdc-be-common-project-view
+    project-name: sdc-sdc-be-common
+    views:
+      - project-view
+
+- project:
+    name: sdc-sdc-be-common
+    project-name: 'sdc-sdc-be-common'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-merge-java'
+    project: 'sdc/sdc-be-common'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-sdc-be-common-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+
+- project:
+    name: sdc-sdc-be-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'sdc/sdc-be-common'
+    project-name: 'sdc-sdc-be-common'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-be-common-settings'
+    mvn-params: '-Dsonar.branch={branch}'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-sdc-be-common-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: sdc/sdc-be-common
+    project-name: 'sdc-sdc-be-common'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-be-common-settings'
+
+- project:
+    name: sdc-sdc-be-common-info
+    project-name: sdc-sdc-be-common
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/sdc-be-common
+    branch: master
index 273fda7..03b9d2a 100644 (file)
@@ -12,6 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
index f94773a..2930983 100644 (file)
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     files: '**'
     archive-artifacts: ''
index f1ef58c..73662b9 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
index b204229..7db82e5 100644 (file)
@@ -19,6 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
index a6e2dd5..a164c54 100644 (file)
@@ -45,6 +45,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
index 3cba3d9..cf747e7 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
@@ -58,8 +58,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
@@ -95,8 +93,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
index 32ed192..7e0f5de 100644 (file)
@@ -5,15 +5,15 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/northbound'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
@@ -51,8 +51,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
index f6eb04c..2b29994 100644 (file)
@@ -6,14 +6,14 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'sdnc/oam'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
@@ -33,8 +33,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
@@ -70,8 +68,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
index d29d43c..ca5e95a 100644 (file)
@@ -4,7 +4,11 @@ echo '============== CALLING SCRIPT TO CREATE DOCKER IMAGES ================='
 cp $WORKSPACE/docker/* .
 docker -D build -t onap/testsuite .
 export REPO="nexus3.onap.org:10003"
-for tag in $tags
+
+DATETIME_STAMP=$(date +%Y%m%dT%H%M%S)
+STAGING_TAG=${base_version}-STAGING-${DATETIME_STAMP}Z
+
+for tag in $tags $STAGING_TAG
 do
   docker tag onap/testsuite:latest $REPO/onap/testsuite:$tag
   docker push $REPO/onap/testsuite:$tag
diff --git a/jjb/testsuite/testsuite-heatbridge-release.yaml b/jjb/testsuite/testsuite-heatbridge-release.yaml
deleted file mode 100644 (file)
index cf46f14..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- project:
-    name: testsuite-heatbridge-release
-    project-name: 'testsuite-heatbridge'
-    subproject:
-      - heatbridge:
-          path: '.'
-          pattern: '**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-
-    project: 'testsuite/heatbridge'
-
-    stream:
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-    mvn-settings: 'testsuite-heatbridge-settings'
similarity index 95%
rename from jjb/testsuite/testsuite-heatbridge-master.yaml
rename to jjb/testsuite/testsuite-heatbridge.yaml
index fd6ec4c..20ba913 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'testsuite-heatbridge-settings'
     files: '**'
     archive-artifacts: ''
index 5413597..5cd6815 100644 (file)
       - 'robotframework-onap':
           tox-dir: robotframework-onap/
           tox-envs: ''
-
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'testsuite-python-testing-utils-settings'
     files: '**'
     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 d41cc6d..0b1e6cb 100644 (file)
     project: 'testsuite'
 
     extra-project1: 'testsuite/python-testing-utils'
-    extra-branch1: 'master'
-    extra-refspec1: 'refs/heads/master'
+    extra-branch1: '{branch}'
+    extra-refspec1: 'refs/heads/{branch}'
     checkout-dir1: 'testsuite/eteutils'
 
     extra-project2: 'testsuite/heatbridge'
-    extra-branch2: 'master'
-    extra-refspec2: 'refs/heads/master'
+    extra-branch2: '{branch}'
+    extra-refspec2: 'refs/heads/{branch}'
     checkout-dir2: 'testsuite/heatbridge'
 
     extra-project3: 'demo'
index 92e4eb7..b705594 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-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
index d0e8809..1e034bf 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-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
index 63ed409..cb8b137 100755 (executable)
@@ -12,8 +12,3 @@ chmod 755 ./zte/vmanager/docker/*.*
 echo '============== BUILDING HUAWEI IMAGE ================='
 chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
 ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
-
-echo '============== BUILDING NOKIA V1 IMAGE ================='
-chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
-./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
-
index 2442077..0bf14a5 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 1264efd..7a9a5d2 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index e9fa8fe..41fe317 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 81b4527..27762f9 100644 (file)
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 86f9e5c..30200de 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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index e295551..9ca9178 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 10ea310..aa4e8c6 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'zte/sfc-driver/pom.xml'
+          mvn-params: '-f zte/sfc-driver/pom.xml'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 46a0e3c..6bb4318 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'huawei/pom.xml'
+          mvn-params: '-f huawei/pom.xml'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
index ac8c87e..17fa14f 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'gvnfmadapter/pom.xml'
+          mvn-params: '-f gvnfmadapter/pom.xml'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 788b8fb..2fea7c7 100644 (file)
@@ -15,7 +15,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
index abcf1ed..3ba98f6 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'nokiav2/pom.xml'
+          mvn-params: '-f nokiav2/pom.xml'
     files: 'nokiav2/**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
index 1dd3cff..2ce9b1c 100644 (file)
       - '{project-name}-{stream}-merge-profile-java':
           build-node: ubuntu1604-docker-8c-8g
           pattern: 'pom.xml'
-      - '{project-name}-{stream}-release-version-profile-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-P rootOnly'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
index 3663663..2bb739e 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'zte/vmanager/pom.xml'
+          mvn-params: '-f zte/vmanager/pom.xml'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
index 2805ea9..ecfa23a 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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 935ffca..c5de861 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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 7ebfd06..b377c03 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-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
index 9664d08..1f89eae 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
           mvn-goals: 'clean'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: vfc-nfvo-wfengine-engine-mgr-service-stage
+    project-name: 'vfc-nfvo-wfengine-engine-mgr-service'
+    project: 'vfc/nfvo/wfengine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    subproject:
+      - 'engine-mgr-service':
+          pom: 'wfenginemgrservice/pom.xml'
+          pattern: 'wfenginemgrservice/**'
+          script:
+            !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'wfenginemgrservice/pom.xml'
+          mvn-params: '-f wfenginemgrservice/pom.xml'
+
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: vfc-nfvo-wfengine-engine-activiti-extension-stage
+    project-name: 'vfc-nfvo-wfengine-engine-activiti-extension'
+    project: 'vfc/nfvo/wfengine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    subproject:
+      - 'engine-activiti-extension':
+          pom: 'activiti-extension/pom.xml'
+          pattern: 'activiti-extension/**'
+          script:
+            !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'activiti-extension/pom.xml'
+          mvn-params: '-f activiti-extension/pom.xml'
+
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
     jobs:
index c4643e5..b8d0b0a 100644 (file)
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'healthCheck':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
index d3ffe68..3a75eca 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: queue-docker-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-P docker'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project: 'vid'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'vid-settings'
     files: '**'
     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'
-    mvn-settings: 'vid-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: queue-docker-4c-4g
-
 #- project:
 #    name: vid-docker-arm64
 #    project-name: 'vid-arm64'
index c5fb7b6..da1d5e2 100644 (file)
@@ -5,5 +5,4 @@ source $WORKSPACE/venv-tox/bin/activate
 pip install --upgrade pip
 pip install -r etc/requirements.txt
 ls
-wget -O $WORKSPACE/docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json"
 tox -e needs
\ No newline at end of file
index ec01814..1cb0f11 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ec01814071eaea55ea7b025308b58d3923897eb6
+Subproject commit 1cb0f11add7a8494b6b22f4d55a5ab3f7b1ee3cd
index 37ca313..d38ff8f 100644 (file)
         name: libxml2-utils
         state: present
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install python-tox
-      apt:
-        name: python-tox
+      pip:
+        name: tox
         state: present
       become: true
 
         repo: ppa:jonathonf/python-3.6
         state: present
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Update and upgrade apt packages
       apt:
         upgrade: yes
         update_cache: yes
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install Python 3.6 and packages
       apt:
@@ -85,6 +88,7 @@
           - libmysqlclient-dev
           - gcc
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install base packages
       apt:
           - libssl-dev
           - libffi-dev
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install autorelease support packages
       apt:
           - maven
           - python-ncclient
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome key
       apt_key:
         url: https://dl-ssl.google.com/linux/linux_signing_key.pub
         state: present
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome repo
       copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Update apt cache
       apt: update_cache=yes
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install Google Chrome
       apt:
         name: google-chrome-stable
         state: present
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install Erlang dependency packages
       apt:
           - libsctp1
           - libwxbase3.0-0v5
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - 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
-      install_recommends: yes
+        deb: https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Clone rebar3
       git:
         repo: 'https://github.com/erlang/rebar3.git'
         dest: /tmp/rebar3
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Bootstrap rebar3
       command: ./bootstrap
       args:
         chdir: /tmp/rebar3
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install rebar3 to bin
       copy:
         mode: 0755
         remote_src: true
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Remove unused rebar3 source
       file:
         path: /tmp/rebar3
         state: absent
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Download geckodriver
       unarchive:
         mode: 0755
         remote_src: yes
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Download Firefox version 55.0.3
       unarchive:
         dest: /opt
         mode: 0755
         remote_src: yes
-      when: "'x86_64' in ansible_architecture"
       become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Create symbolic link to firefox bin
       file:
         src: "/opt/firefox/firefox"
         dest: "/usr/bin/firefox"
         state: link
-      when: "'x86_64' in ansible_architecture"
       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/packer/vars/centos-7.json b/packer/vars/centos-7.json
deleted file mode 100644 (file)
index 3bae793..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "base_image": "ZZCI - CentOS 7 - builder - 20180328-1726",
-  "ssh_user": "centos",
-  "distro": "CentOS 7",
-  "cloud_user_data": "provision/rh-user_data.sh"
-}
diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh
new file mode 100644 (file)
index 0000000..22a42c2
--- /dev/null
@@ -0,0 +1,166 @@
+#!/bin/bash
+
+# Copyright 2019 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -Eeuxo pipefail
+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
+
+CURL_OUTPUT=$(
+  curl \
+    --verbose \
+    --silent \
+    --show-error \
+    --fail \
+    --form "project=${COVERITY_PROJECT_NAME}" \
+    --form "token=${COVERITY_TOKEN}" \
+    'https://scan.coverity.com/api/upload_permitted'
+)
+
+IS_COVERITY_UPLOAD_PERMITTED=$(
+  echo "${CURL_OUTPUT}" \
+  | jq '.upload_permitted'
+)
+if [ x"${IS_COVERITY_UPLOAD_PERMITTED}" != x'true' ]; then
+  echo "Upload quota reached. Next upload permitted at "$(echo "${CURL_OUTPUT}" | jq '.next_upload_permitted_at') >&2
+  exit 1
+fi
+
+#-----------------------------------------------------------------------------
+# Get Coverity Scan build tool
+
+curl \
+  --verbose \
+  --silent \
+  --show-error \
+  --fail \
+  --form "project=${COVERITY_PROJECT_NAME}" \
+  --form "token=${COVERITY_TOKEN}" \
+  --output 'coverity_tool.tgz' \
+  'https://scan.coverity.com/download/linux64'
+
+curl \
+  --verbose \
+  --silent \
+  --show-error \
+  --fail \
+  --form "project=${COVERITY_PROJECT_NAME}" \
+  --form "token=${COVERITY_TOKEN}" \
+  --form 'md5=1' \
+  --output 'coverity_tool.md5' \
+  'https://scan.coverity.com/download/linux64'
+
+echo -n ' coverity_tool.tgz' >> 'coverity_tool.md5'
+md5sum --check 'coverity_tool.md5'
+
+tar \
+  --extract \
+  --gunzip \
+  --file='coverity_tool.tgz'
+
+COVERITY_BUILD_TOOL_DIRECTORY=$(
+  head -1 <( \
+    tar \
+      --list \
+      --gunzip \
+      --file='coverity_tool.tgz'
+  )
+)
+COVERITY_BINARY_DIRECTORY="${COVERITY_BUILD_TOOL_DIRECTORY}bin"
+test -d "${COVERITY_BINARY_DIRECTORY}" \
+  || exit 1
+export PATH="${PATH}:${COVERITY_BINARY_DIRECTORY}"
+
+rm 'coverity_tool.tgz'
+
+#-----------------------------------------------------------------------------
+# Build
+
+export MAVEN_OPTS
+
+eval cov-build \
+  --dir 'cov-int' \
+  ${FS_CAPTURE_SEARCH_PARAMS} \
+  "${MVN}" clean install \
+    --errors \
+    --global-settings "${GLOBAL_SETTINGS_FILE}" \
+    --settings "${SETTINGS_FILE}" \
+    ${MAVEN_OPTIONS:=} \
+    ${MAVEN_PARAMS:=}
+
+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
+
+tar \
+  --create \
+  --gzip \
+  --file='results.tgz' \
+  'cov-int'
+
+curl \
+  --verbose \
+  --silent \
+  --show-error \
+  --fail \
+  --form "project=${COVERITY_PROJECT_NAME}" \
+  --form "email=${COVERITY_USER_EMAIL}" \
+  --form "token=${COVERITY_TOKEN}" \
+  --form 'file=@results.tgz' \
+  --form "version=${GIT_COMMIT:0:7}" \
+  --form "description=${GIT_BRANCH}" \
+  'https://scan.coverity.com/builds'
+
+#-----------------------------------------------------------------------------
+
+exit 0