Merge "Migrate to gerrit-maven-stage (CLAMP)"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 16 May 2019 17:24:11 +0000 (17:24 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 16 May 2019 17:24:11 +0000 (17:24 +0000)
263 files changed:
Sandbox_Setup.md
global-jjb
jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg [new file with mode: 0644]
jenkins-scripts/jenkins-init-script.sh
jenkins-scripts/nexus3_port_forwarding.sh [new file with mode: 0755]
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-luaplugin.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 [new file with mode: 0644]
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-csit.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/cds.yaml
jjb/ccsdk/dashboard.yaml [new file with mode: 0644]
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-packer-jobs.yaml
jjb/ci-management/ci-management-views.yaml [new file with mode: 0644]
jjb/ci-management/ci-management.yaml
jjb/clamp/clamp-csit.yaml
jjb/clamp/clamp.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-analytics-tca.yaml [moved from jjb/dcaegen2/apod-analytics.yaml with 85% similarity]
jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml [new file with mode: 0644]
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-cdapbroker.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-cli.yaml
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 [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-java.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dcaegen2/dcaegen2-services-son-handler.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml [moved from jjb/dcaegen2/dcaegen2-csit.yaml with 72% similarity]
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-macros.yaml
jjb/global-templates-c.yaml
jjb/global-templates-docker.yaml
jjb/global-templates-helm.yaml
jjb/global-templates-java.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-dsa.yaml [deleted file]
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/integration-csit.yaml
jjb/integration/integration-devtool.yaml
jjb/integration/integration-docker.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/build-modeling-genericparser-docker-image.sh [new file with mode: 0644]
jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml [moved from jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml with 54% similarity]
jjb/modeling/modeling-toscaparsers-genericparser.yaml [new file with mode: 0644]
jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml [deleted file]
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/build-multicloud-framework-docker-image.sh
jjb/multicloud/build-multicloud-openstack-docker-image.sh
jjb/multicloud/multicloud-azure-java.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-k8s-csit.yaml [moved from jjb/vnfsdk/vnfsdk-ice-csit.yaml with 57% similarity]
jjb/multicloud/multicloud-k8s.yaml
jjb/multicloud/multicloud-openstack-casablanca.yaml [deleted file]
jjb/multicloud/multicloud-openstack-fcaps-csit.yaml [moved from jjb/usecaseui/usecase-ui-server-csit.yaml with 53% similarity]
jjb/multicloud/multicloud-openstack-lenovo-csit.yaml [moved from jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml with 52% similarity]
jjb/multicloud/multicloud-openstack-ocata-csit.yaml
jjb/multicloud/multicloud-openstack-pike-csit.yaml
jjb/multicloud/multicloud-openstack-vmware-csit.yaml
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-mdbc.yaml
jjb/music/music-prom.yaml
jjb/music/music-trigger.yaml [deleted file]
jjb/music/music.yaml
jjb/onap-jjb/onap-pypi-template.yaml
jjb/oom/offline-installer-review-bootstrap.sh [new file with mode: 0644]
jjb/oom/offline-installer.yaml [new file with mode: 0644]
jjb/oom/oom-jobs.yaml [new file with mode: 0644]
jjb/oom/oom-oneclick-config.yaml
jjb/oom/oom-registrator.yaml
jjb/oparent/oparent.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/drools-apps-docker-merge.sh [new file with mode: 0644]
jjb/policy/drools-apps-docker-release.sh [new file with mode: 0644]
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-core.yaml [deleted file]
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml [new file with mode: 0644]
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-engine.yaml
jjb/policy/policy-gui.yaml [deleted file]
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-pdp.yaml [deleted file]
jjb/policy/policy-xacml-pdp.yaml
jjb/portal-sdk/portal-sdk.yaml
jjb/portal/portal.yaml
jjb/sdc/sdc-csit.yaml
jjb/sdc/sdc-dcae-d-ci.yaml
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-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-pubsub.yaml
jjb/sdc/sdc-sdc-titan-cassandra.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-csit.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/so/so-csit.yaml
jjb/so/so-libs.yaml
jjb/so/so.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 78% similarity]
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/testsuite/testsuite.yaml
jjb/usecases/5G-bulkpm.yaml
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
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-svnfm-nokia.yaml [deleted file]
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.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/build-and-upload.yaml [new file with mode: 0644]
jjb/vnfrqts/post-upload-artifact.sh [new file with mode: 0644]
jjb/vnfrqts/pre-build-needs.sh [new file with mode: 0644]
jjb/vnfrqts/vnfrqts-requirements.yaml
jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
jjb/vnfsdk/vnfsdk-ice-python.yaml [deleted file]
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vvp/pre-build-csv.sh [new file with mode: 0644]
jjb/vvp/vvp-cms.yaml [deleted file]
jjb/vvp/vvp-devkit.yaml [deleted file]
jjb/vvp/vvp-documentation.yaml
jjb/vvp/vvp-engagementmgr.yaml [deleted file]
jjb/vvp/vvp-gitlab.yaml [deleted file]
jjb/vvp/vvp-image-scanner.yaml [deleted file]
jjb/vvp/vvp-jenkins.yaml [deleted file]
jjb/vvp/vvp-portal.yaml [deleted file]
jjb/vvp/vvp-postgresql.yaml [deleted file]
jjb/vvp/vvp-test-engine.yaml [deleted file]
jjb/vvp/vvp-validation-scripts.yaml
jjb/wss-unified-agent.config [new file with mode: 0644]
packer/provision/basebuild/.dummy [deleted file]
packer/provision/local-docker.yaml
shell/apply-submodule-patch-oom.sh [new file with mode: 0644]

index 42ed608..abdc7c7 100644 (file)
@@ -25,8 +25,9 @@ please send email to helpdesk@onap.org (LF helpdesk team)
 To download **ci-management**, execute the following command to clone the
 **ci-managment** repository.
 
-`git clone ssh://<LFID>@gerrit.onap.org:29418/ci-management --recursive && scp -p -P 29418 \
-<LFID>@gerrit.onap.org:hooks/commit-msg ci-management/.git/hooks/`
+`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; \
+chmod +x $(git rev-parse --git-dir)/hooks/commit-msg)`
 
 Make sure to sync global-jjb submodule using:
 
@@ -51,7 +52,7 @@ jenkins-jobs test --recursive jjb/
 
 Backup the jenkins.ini.example to jenkins.ini
 
-`cp jenkins.ini.example 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**
@@ -72,7 +73,9 @@ ignore_cache=True
 ```
 ### How to retrieve API token?
 Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user
-page by clicking on your username. Click **Configure** and then click **Show API Token**.
+page by clicking on your username. Click **Configure** and then click **Add new Token**.
+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
 will find all job templates for the project.  Follow the below commands to test,
@@ -83,9 +86,9 @@ update or delete jobs in your sandbox environment.
 After you modify or create jobs in the above environment, it's good practice
 to test the job in sandbox environment before you submit this job to production CI environment.
 
-`jenkins-jobs --conf jenkins.ini test jjb/ <job-name>`
+`jenkins-jobs test jjb/ <job-name>`
 
-**Example:** `jenkins-jobs --conf jenkins.ini test jjb/ sdc-master-verify-java`
+**Example:** `jenkins-jobs test jjb/ sdc-master-verify-java`
 
 If the job you’d like to test is a template with variables in its name, it must be
 manually expanded before use. For example, the commonly used template `sdc-{stream}-verify-java`
@@ -96,7 +99,7 @@ specified JJB job name.
 
 Execute the following command to pipe-out to a directory:
 
-`jenkins-jobs --conf jenkins.ini test jjb/ <job-name> -o <directoryname>`
+`jenkins-jobs test jjb/ <job-name> -o <directoryname>`
 
 The output directory will contain files with the XML configurations.
 
@@ -107,9 +110,9 @@ outputting valid XML descriptions of Jenkins jobs. Upon successful
 verification, execute the following command to update the job to the
 Jenkins sandbox.
 
-`jenkins-jobs --conf jenkins.ini update jjb/ <job-name>`
+`jenkins-jobs update jjb/ <job-name>`
 
-**Example:** `jenkins-jobs --conf jenkins.ini update jjb/ sdc-master-verify-java`
+**Example:** `jenkins-jobs update jjb/ sdc-master-verify-java`
 
 ## Trigger jobs from Jenkins Sandbox:
 
@@ -132,9 +135,9 @@ details and the console output.
 
 Execute the following command to Delete a job from Sandbox:
 
-`jenkins-jobs --conf jenkins.ini delete jjb/ <job-name>`
+`jenkins-jobs delete jjb/ <job-name>`
 
-**Example:** `jenkins-jobs --conf jenkins.ini delete jjb/ sdc-master-verify-java`
+**Example:** `jenkins-jobs delete jjb/ sdc-master-verify-java`
 
 The above command would delete the `sdc-master-verify-java` job.
 
index 1f1f893..59af00a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1f1f893e77014a6b08d61e88614ff928b2c17587
+Subproject commit 59af00afa9923c744db50cd105f9bb27b7356aaa
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..9d65184
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190507-002922.623
+LABELS=centos7-docker-8c-8g
+HARDWARE_ID=v2-highcpu-8
index c328e94..f47c417 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20181031-164620.606
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20190410-005349.357
 LABELS=ubuntu1604-docker-arm64-4c-2g
 HARDWARE_ID=lf-standard-2
index 60167f2..db219ca 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 - 20190123-052615.439
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
new file mode 100644 (file)
index 0000000..a3bdd73
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
+LABELS=ubuntu1604-docker-8c-8g
+HARDWARE_ID=v1-standard-8
index 67987b5..dd76d8a 100755 (executable)
@@ -25,3 +25,6 @@ fi
 # Create the jenkins user last so that hopefully we don't have to deal with
 # guard files
 ./create_jenkins_user.sh
+
+# Nexus3 port forwarding rules for ARM64
+./nexus3_port_forwarding.sh
diff --git a/jenkins-scripts/nexus3_port_forwarding.sh b/jenkins-scripts/nexus3_port_forwarding.sh
new file mode 100755 (executable)
index 0000000..31d41b2
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+echo "---> nexus3_port_forwarding.sh"
+set +e  # DON'T fail build if script fails.
+
+NEXUS3_IP=`host nexus3.onap.org | awk '/has address/ { print $4 ; exit }'`
+OS_ARCH=$(ANSIBLE_STDOUT_CALLBACK=json ANSIBLE_LOAD_CALLBACK_PLUGINS=1 \
+    ansible all -i "localhost," --connection=local -m setup | jq -r \
+    '.. | .ansible_architecture? | select(type != "null")' \
+    | tr '[:upper:]' '[:lower:]')
+
+
+if [[ "${OS_ARCH}" == "aarch64" ]] ;then
+  echo "os_arch: $OS_ARCH"
+  iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10001 -j DNAT --to-destination ${NEXUS3_IP}:11001
+  iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10002 -j DNAT --to-destination ${NEXUS3_IP}:11002
+  iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10003 -j DNAT --to-destination ${NEXUS3_IP}:11003
+fi
+
+# DON'T fail build if script fails.
+exit 0
index 8bfd2aa..4cb7359 100644 (file)
     project-name: 'aaf-authz'
     branch: 'master'
     mvn-settings: 'aaf-authz-settings'
+
+- project:
+    name: aaf-authz-info
+    project-name: aaf-authz
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/authz
+    branch: master
index 523c67e..a605a81 100644 (file)
     project-name: 'aaf-cadi'
     branch: 'master'
     mvn-settings: 'aaf-cadi-settings'
+
+- project:
+    name: aaf-cadi-info
+    project-name: aaf-cadi
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/cadi
+    branch: master
index 14bb22f..8733823 100644 (file)
@@ -8,3 +8,11 @@
     project: 'aaf/luaplugin'
     branch: 'master'
     mvn-settings: 'aaf-luaplugin-settings'
+
+- project:
+    name: aaf-luaplugin-info
+    project-name: aaf-luaplugin
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/luaplugin
+    branch: master
index 3e0e8cd..6341892 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aaf-sms-info
+    project-name: aaf-sms
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/sms
+    branch: master
index 0782b9d..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:
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aaf-sshsm-info
+    project-name: aaf-sshsm
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/sshsm
+    branch: master
index 4dddda5..3b6337d 100644 (file)
@@ -16,8 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -32,7 +32,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-aai-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-aai-common-info
+    project-name: aai-aai-common
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/aai-common
+    branch: master
index fc886cf..3f5e6e4 100644 (file)
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
@@ -35,7 +35,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/babel'
     project-name: 'aai-babel'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-babel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/babel'
     project-name: 'aai-babel'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+
+- project:
+    name: aai-babel-info
+    project-name: aai-babel
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/babel
+    branch: master
index 0e90a12..06edc0c 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: '**'
@@ -31,7 +31,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/cacher'
     project-name: 'aai-cacher'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-cacher-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/cacher'
     project-name: 'aai-cacher'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 
+
+- project:
+    name: aai-cacher-info
+    project-name: aai-cacher
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/cacher
+    branch: master
index a3befbb..fc7fdab 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'
     project: 'aai/chameleon'
     project-name: 'aai-chameleon'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-chameleon-settings'
+
+- project:
+    name: aai-chameleon-info
+    project-name: aai-chameleon
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/chameleon
+    branch: master
index c83335b..fb5a3ab 100644 (file)
@@ -20,8 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-champ-settings'
     files: '**'
     archive-artifacts: ''
@@ -35,7 +35,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/champ'
     project-name: 'aai-champ'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-champ-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/champ'
     project-name: 'aai-champ'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-champ-settings'
+
+- project:
+    name: aai-champ-info
+    project-name: aai-champ
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/champ
+    branch: master
index 870f9bc..5f49aef 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'
@@ -34,7 +34,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/data-router'
     project-name: 'aai-data-router'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-data-router-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/data-router'
     project-name: 'aai-data-router'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-data-router-settings'
+
+- project:
+    name: aai-data-router-info
+    project-name: aai-data-router
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/data-router
+    branch: master
index c473cda..6f9d561 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: ''
     project: 'aai/esr-gui'
     project-name: 'aai-esr-gui'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-esr-gui-settings'
+
+- project:
+    name: aai-esr-gui-info
+    project-name: aai-esr-gui
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/esr-gui
+    branch: master
index 0d8c990..21567fb 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: ''
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-esr-server-settings'
+
+- project:
+    name: aai-esr-server-info
+    project-name: aai-esr-server
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/esr-server
+    branch: master
index ad7da4c..3b29da3 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'
     project: 'aai/event-client'
     project-name: 'aai-event-client'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-event-client-settings'
+
+- project:
+    name: aai-event-client-info
+    project-name: aai-event-client
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/event-client
+    branch: master
index fefd7c9..1f575ea 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'
     project: 'aai/gallifrey'
     project-name: 'aai-gallifrey'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-gallifrey-settings'
+
+- project:
+    name: aai-gallifrey-info
+    project-name: aai-gallifrey
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/gallifrey
+    branch: master
index bb46018..76ba0ea 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'
@@ -35,7 +35,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/gizmo'
     project-name: 'aai-gizmo'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-gizmo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/gizmo'
     project-name: 'aai-gizmo'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-gizmo-settings'
+
+- project:
+    name: aai-gizmo-info
+    project-name: aai-gizmo
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/gizmo
+    branch: master
index 7e608e1..646e853 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: '**'
@@ -37,7 +37,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-graphadmin-info
+    project-name: aai-graphadmin
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/graphadmin
+    branch: master
index 5464086..31cedd1 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-2c-4g
+
     project: 'aai/graphgraph'
     stream:
       - 'master':
     mvn-settings: 'aai-graphgraph-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aai-graphgraph-info
+    project-name: aai-graphgraph
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/graphgraph
+    branch: master
index 566ae90..ac64c91 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'
     project: 'aai/logging-service'
     project-name: 'aai-logging-service'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
+
+- project:
+    name: aai-logging-service-info
+    project-name: aai-logging-service
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/logging-service
+    branch: master
index b9382be..0546abc 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'
@@ -35,7 +35,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
+
+- project:
+    name: aai-model-loader-info
+    project-name: aai-model-loader
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/model-loader
+    branch: master
diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
new file mode 100644 (file)
index 0000000..816ecff
--- /dev/null
@@ -0,0 +1,37 @@
+---
+- project:
+    name: aai-oom-project-view
+    project-name: aai-oom
+    views:
+      - project-view
+
+- project:
+    name: aai-oom
+    helm-module: 'aai'
+    project-name: 'aai-oom'
+    project: 'aai/oom'
+    jobs:
+      - '{project-name}-{stream}-verify-external-helm'
+      - '{project-name}-{stream}-merge-external-helm':
+          build_script: '{oom_build_script}'
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+          files: '**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-oom-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-helm-2c-1g
+    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
+    oom_build_script: |
+        #!/bin/bash
+        set -e -o pipefail
+        cd kubernetes/
+        make all
+    build_script: |
+        #!/bin/bash
+        cd kubernetes/
+        make common
+        make {helm-module}
+    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
index 30338af..96234eb 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: '**'
@@ -37,7 +37,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-resources-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/resources'
     project-name: 'aai-resources'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-resources-info
+    project-name: aai-resources
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/resources
+    branch: master
index 025fc7f..a6fd5a1 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'
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
+
+- project:
+    name: aai-rest-client-info
+    project-name: aai-rest-client
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/rest-client
+    branch: master
index d7e2e22..92e3e24 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'
     project: 'aai/router-core'
     project-name: 'aai-router-core'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-router-core-settings'
+
+- project:
+    name: aai-router-core-info
+    project-name: aai-router-core
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/router-core
+    branch: master
index e4c4bd1..0203729 100644 (file)
@@ -33,9 +33,9 @@
       - gerrit-maven-sonar
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/resources'
+    project: 'aai/schema-service'
     project-name: 'aai-schema-service'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    project: 'aai/resources'
+    project: 'aai/schema-service'
     project-name: 'aai-schema-service'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-schema-service-info
+    project-name: aai-schema-service
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/schema-service
+    branch: master
index bd44eb4..a111ffd 100644 (file)
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
+          pom: 'search-data-service-app/pom.xml'
           mvn-goals: 'docker:build'
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/search-data-service'
+    docker-image-name: 'onap/search-data-service'
+    stream:
+      - 'dublin':
+          branch: 'dublin'
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-search-data-service-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: aai-search-data-service-searchguard
+    project-name: 'aai-search-data-service-searchguard'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'elasticsearch-sg/pom.xml'
+          mvn-goals: 'docker:build'
+          build-node: ubuntu1604-docker-8c-8g
+    project: 'aai/search-data-service'
+    docker-image-name: 'onap/elasticsearch-sg'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
@@ -34,7 +52,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
+
+- project:
+    name: aai-search-data-service-info
+    project-name: aai-search-data-service
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/search-data-service
+    branch: master
index 2a9c886..373a1aa 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'
@@ -34,7 +34,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
+
+- project:
+    name: aai-sparky-be-info
+    project-name: aai-sparky-be
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/sparky-be
+    branch: master
index 08106bd..c75d5bf 100644 (file)
@@ -9,10 +9,18 @@
       - '{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'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aai-sparky-fe-info
+    project-name: aai-sparky-fe
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/sparky-fe
+    branch: master
index 5dd744b..7f01185 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'
@@ -35,7 +35,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/spike'
     project-name: 'aai-spike'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-spike-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project: 'aai/spike'
     project-name: 'aai-spike'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-spike-settings'
+
+- project:
+    name: aai-spike-info
+    project-name: aai-spike
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/spike
+    branch: master
index 83acb9e..26c8713 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: '**'
@@ -37,7 +37,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/traversal'
     project-name: 'aai-traversal'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-traversal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-traversal-info
+    project-name: aai-traversal
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/traversal
+    branch: master
index ea7319c..52dc8af 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'
@@ -35,7 +35,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/validation'
     project-name: 'aai-validation'
-    branch: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-validation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project: 'aai/validation'
     project-name: 'aai-validation'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-validation-settings'
 
+
+- project:
+    name: aai-validation-info
+    project-name: aai-validation
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/validation
+    branch: master
index 4253db4..d66a902 100644 (file)
@@ -5,14 +5,17 @@
     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: 'appc/cdt'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''
     branch: 'master'
     mvn-settings: 'appc-cdt-settings'
 
+
+- project:
+    name: appc-cdt-info
+    project-name: appc-cdt
+    jobs:
+      - gerrit-info-yaml-verify
+    project: appc/cdt
+    branch: master
index 3fe0049..7e8dfa3 100644 (file)
@@ -7,9 +7,7 @@
     project-name: 'appc'
     stream:
       - 'master':
-          branch: master
-      - 'casablanca':
-          branch: 'casablanca'
+          branch: 'master'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index a46313a..220e3cf 100644 (file)
@@ -6,6 +6,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-name}-{stream}-release-version-java-daily'
       - '{project-name}-docker-image-blessing'
 
@@ -13,8 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: appc-deployment-arm64
-    project-name: 'appc-deployment-arm64'
-    jobs:
-      - '{project-name}-docker-image-blessing'
-
-    project: 'appc/deployment'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'appc-deployment-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: appc-deployment-arm64
+#    project-name: 'appc-deployment-arm64'
+#    jobs:
+#      - '{project-name}-docker-image-blessing'
+#
+#    project: 'appc/deployment'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'appc-deployment-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    docker-pom: 'pom.xml'
+#    mvn-profile: docker
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: appc-deployment-docker
     project-name: 'appc-deployment'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: queue-docker-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
+
+#- project:
+#    name: appc-deployment-arm64-docker
+#    project-name: 'appc-deployment-arm64'
+#    jobs:
+#      - 'docker-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#      - 'docker-version-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'appc/deployment'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'appc-deployment-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    docker-pom: 'pom.xml'
+#    mvn-profile: docker
+#    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
-    name: appc-deployment-arm64-docker
-    project-name: 'appc-deployment-arm64'
+    name: appc-deployment-info
+    project-name: appc-deployment
     jobs:
-      - 'docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'appc/deployment'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'appc-deployment-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-arm64-4c-2g
+      - gerrit-info-yaml-verify
+    project: appc/deployment
+    branch: master
index 9120504..71e3700 100644 (file)
@@ -7,6 +7,10 @@
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-merge-java':
           build-node: ubuntu1604-builder-8c-8g
+      - 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
 
@@ -14,8 +18,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-settings'
     files: '**'
     archive-artifacts: ''
     jobs:
       - gerrit-maven-clm:
           mvn-params: '-DskipTests'
-          build-timeout: 30
+          build-timeout: 60
           build-node: ubuntu1604-builder-8c-8g
     nexus-iq-namespace: 'onap-'
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
     mvn-settings: 'appc-settings'
+
+- project:
+    name: appc-info
+    project-name: appc
+    jobs:
+      - gerrit-info-yaml-verify
+    project: appc
+    branch: master
index 99025ac..efb25d0 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: 'appc/parent'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-parent-settings'
     build-node: ubuntu1604-builder-2c-1g
+
+- project:
+    name: appc-parent-info
+    project-name: appc-parent
+    jobs:
+      - gerrit-info-yaml-verify
+    project: appc/parent
+    branch: master
index f85ad5f..9ee4277 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-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
@@ -54,6 +59,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
     build-node: ubuntu1604-builder-4c-4g
 
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: queue-docker-4c-4g
+#
+#- project:
+#    name: ccsdk-apps-arm64-docker
+#    project-name: 'ccsdk-apps-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'ccsdk/apps'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'ccsdk-apps-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    docker-pom: 'pom.xml'
+#    mvn-profile: docker
+#    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
-    name: ccsdk-apps-arm64-docker
-    project-name: 'ccsdk-apps-arm64'
+    name: ccsdk-apps-info
+    project-name: ccsdk-apps
     jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-arm64-4c-2g
+      - gerrit-info-yaml-verify
+    project: ccsdk/apps
+    branch: master
index 2890a4e..c97d193 100644 (file)
@@ -10,6 +10,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index f1efc61..4217854 100644 (file)
@@ -5,12 +5,17 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/cds'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-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
@@ -44,6 +49,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-settings'
     build-node: ubuntu1604-builder-4c-4g
 
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: queue-docker-4c-4g
+
+- project:
+    name: ccsdk-cds-info
+    project-name: ccsdk-cds
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/cds
+    branch: master
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
new file mode 100644 (file)
index 0000000..c3f6d0e
--- /dev/null
@@ -0,0 +1,73 @@
+---
+- project:
+    name: ccsdk-dashboard
+    project-name: 'ccsdk-dashboard'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'ccsdk/dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    mvn-settings: 'ccsdk-dashboard-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
+
+- project:
+    name: ccsdk-dashboard-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: centos7-redis-4c-4g
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-dashboard-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    build-node: centos7-redis-4c-4g
+
+- project:
+    name: ccsdk-dashboard-docker
+    project-name: 'ccsdk-dashboard'
+    jobs:
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'ccsdk/dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: queue-docker-4c-4g
index 174f41f..ce8015e 100644 (file)
@@ -5,13 +5,18 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
+    sign-artifacts: true
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
@@ -31,6 +36,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
     mvn-profile: docker
     build-node: queue-docker-4c-4g
 
-- project:
-    name: ccsdk-distribution-arm64-docker
-    project-name: 'ccsdk-distribution-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/distribution'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: ccsdk-distribution-arm64-docker
+#    project-name: 'ccsdk-distribution-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'ccsdk/distribution'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'ccsdk-distribution-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    docker-pom: 'pom.xml'
+#    mvn-profile: docker
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: ccsdk-distribution-clm
     jobs:
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1604-docker-8c-8g
 
+
+- project:
+    name: ccsdk-distribution-info
+    project-name: ccsdk-distribution
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/distribution
+    branch: master
index 5a9c8ce..3950c98 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/features'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-features-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-features-settings'
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: ccsdk-features-info
+    project-name: ccsdk-features
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/features
+    branch: master
index 0cebc4d..c0d576b 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/parent'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-parent-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-parent-settings'
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: ccsdk-parent-info
+    project-name: ccsdk-parent
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/parent
+    branch: master
index 8610819..b024a7a 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/platform/plugins'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
     build-node: centos7-redis-4c-4g
 
+
+- project:
+    name: ccsdk-platform-plugins-info
+    project-name: ccsdk-platform-plugins
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/platform/plugins
+    branch: master
index b880dcc..1b3237f 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/sli/adaptors'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: ccsdk-sli-adaptors-info
+    project-name: ccsdk-sli-adaptors
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/sli/adaptors
+    branch: master
index fee7df8..a3feadd 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/sli/core'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-settings'
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: ccsdk-sli-core-info
+    project-name: ccsdk-sli-core
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/sli/core
+    branch: master
index 5c85642..66c753b 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/sli/northbound'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: ccsdk-sli-northbound-info
+    project-name: ccsdk-sli-northbound
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/sli/northbound
+    branch: master
index 27f06c9..290cb9b 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/sli/plugins'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-settings'
 
+
+- project:
+    name: ccsdk-sli-plugins-info
+    project-name: ccsdk-sli-plugins
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/sli/plugins
+    branch: master
index b0b011f..5c5e316 100644 (file)
@@ -5,14 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
+    sign-artifacts: true
     project: 'ccsdk/utils'
     stream:
       - 'master':
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-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
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
 
+
+- project:
+    name: ccsdk-utils-info
+    project-name: ccsdk-utils
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ccsdk/utils
+    branch: master
index d812804..081392c 100644 (file)
 
     platforms:
       - centos-7
-      - centos-7-arm64
       - ubuntu-16.04
       - ubuntu-16.04-arm64
-      - ubuntu-18.04-arm64
     templates: builder
 
 - project:
@@ -34,9 +32,9 @@
     build-timeout: 90
 
     platforms:
+      - centos-7
       - ubuntu-16.04
       - ubuntu-16.04-arm64
-      - ubuntu-18.04-arm64
     templates: docker
 
 - project:
diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml
new file mode 100644 (file)
index 0000000..8915a2c
--- /dev/null
@@ -0,0 +1,121 @@
+---
+- releng_view: &releng_view_common
+    name: releng-view-common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
+
+- project:
+    name: '00-Empty View'
+    views:
+      - common-view
+    view-name: '00-Empty View'
+    view-description: >
+      Empty job view. This is used as the default landing view to keep the
+      Jenkins UI responding better while a) under high load and b) when there
+      are a lot of jobs defined in the system
+    view-regex: ''
+
+- view:
+    name: 01-Recent
+    regex: '.*'
+    description: 'List of most recent jobs'
+    job-filters:
+      most-recent:
+        max-to-include: 25
+        check-start-time: true
+    <<: *releng_view_common
+
+- project:
+    name: All-Sonar
+    views:
+      - common-view
+    view-name: All-Sonar
+    view-regex: '^(?=.*-sonar)(?!.*-no-sonar).*'
+    view-description: 'List of Sonar jobs'
+
+- view:
+    name: CLM
+    description: 'List of CLM jobs'
+    regex: '.*-clm-.*'
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - policy-violations
+    recurse: false
+
+- project:
+    name: CSIT
+    views:
+      - csit-view
+    view-name: CSIT
+    view-description: 'List of CSIT jobs'
+    view-regex: '^.*-csit-.*'
+
+- project:
+    name: CSIT-Verify
+    views:
+      - csit-view
+    view-name: CSIT-Verify
+    view-description: 'List of CSIT Verify jobs'
+    view-regex: '^.*-verify-csit.*'
+
+- view:
+    name: Daily-Jobs
+    views:
+      - common-view
+    view-name: Daily-Jobs
+    view-description: 'List of Daily Jobs'
+    view-regex: '.*-daily'
+
+- view:
+    name: External-Labs
+    views:
+      - common-view
+    view-name: External-Labs
+    view-description: 'List of External Labs jobs'
+    view-regex: '^lab-.*'
+
+- project:
+    name: Merge-Jobs
+    views:
+      - common-view
+    view-name: Merge-Jobs
+    view-description: 'List of Merge jobs'
+    view-regex: '.*-merge-.*'
+
+- project:
+    name: Thirdparty
+    views:
+      - common-view
+    view-name: Thirdparty
+    view-description: 'List of Nexus Thirdparty dependencies jobs'
+    view-regex: '.*-thirdparty-.*'
+
+- project:
+    name: Verify-Jobs
+    views:
+      - common-view
+    view-name: Verify-Jobs
+    view-description: 'List of Verify jobs'
+    view-regex: '^.*-verify-.*'
index 5c90a17..b31cffa 100644 (file)
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
     jjb-version: 2.9.1
+
+- project:
+    name: builder-openstack
+    jobs:
+      - gerrit-openstack-cron
+
+    project: ci-management
+    project-name: ci-management
+    build-node: centos7-builder-2c-1g
+
+    jenkins-urls: >
+        https://jenkins.onap.org
+        https://jenkins.onap.org/sandbox
+    openstack-cloud: vex
index 5a81ffa..d069aa5 100644 (file)
@@ -5,11 +5,14 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'clamp'
-    stream: 'master'
+    stream:
+        - 'master':
+              branch: 'master'
+        - 'casablanca':
+              branch: 'casablanca'
     functionality:
       - 'APIs':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
       - 'UIs':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
-    branch: 'master'
index 3a48588..1509546 100644 (file)
 
     project: 'clamp'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
+        - 'casablanca':
+              branch: 'casablanca'
     mvn-settings: 'clamp-settings'
     files: '**'
     archive-artifacts: ''
     mvn-settings: 'clamp-settings'
     build-node: ubuntu1604-docker-8c-8g
     build-timeout: 120
+
+- project:
+    name: clamp-info
+    project-name: clamp
+    jobs:
+      - gerrit-info-yaml-verify
+    project: clamp
+    branch: master
index b2cefd2..418ca65 100644 (file)
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: cli-arm64
-    project-name: 'cli-arm64'
-    jobs:
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'deployment/docker/pom.xml'
-          mvn-goals: 'docker:build'
-          docker-image-name: 'onap/cli'
-
-    project: 'cli'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'cli-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: cli-arm64
+#    project-name: 'cli-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-aai-docker-java-daily':
+#          pom: 'deployment/docker/pom.xml'
+#          mvn-goals: 'docker:build'
+#          docker-image-name: 'onap/cli'
+#
+#    project: 'cli'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'cli-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: cli-sonar
     jobs:
     branch: 'master'
     mvn-settings: 'cli-settings'
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: cli-info
+    project-name: cli
+    jobs:
+      - gerrit-info-yaml-verify
+    project: cli
+    branch: master
index 4676ca9..f5d60d8 100644 (file)
@@ -13,7 +13,8 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: 'ubuntu1604-docker-v1-8c-8g'
+    build-timeout: 300
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     project-name: 'dcaegen2-analytics-pnda'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-pnda-settings'
+
+- project:
+    name: dcaegen2-analytics-pnda-info
+    project-name: dcaegen2-analytics-pnda
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/analytics/pnda
+    branch: master
index 30365ca..6d0d2dc 100644 (file)
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
+
+- project:
+    name: dcaegen2-analytics-tca-gen2-info
+    project-name: dcaegen2-analytics-tca-gen2
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/analytics/tca-gen2
+    branch: master
similarity index 85%
rename from jjb/dcaegen2/apod-analytics.yaml
rename to jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index acd4686..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'
     branch: 'master'
     build-node: ubuntu1604-builder-4c-4g
     mvn-settings: 'dcaegen2-analytics-tca-settings'
+
+- project:
+    name: dcaegen2-analytics-tca-info
+    project-name: dcaegen2-analytics-tca
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/analytics/tca
+    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
new file mode 100644 (file)
index 0000000..6740dae
--- /dev/null
@@ -0,0 +1,20 @@
+- project:
+    name: dcaegen2-collectors-datafile-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-collectors-datafile'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    functionality:
+      - 'ManagementInterface-suite':
+          trigger_jobs:
+           - '{project-name}-{stream}-docker-java-shell-daily'
+      - 'Functional-suite':
+          trigger_jobs:
+           - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+    branch: 'master'
\ No newline at end of file
index bd28fb3..7f06524 100644 (file)
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
+
+- project:
+    name: dcaegen2-collectors-datafile-info
+    project-name: dcaegen2-collectors-datafile
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/collectors/datafile
+    branch: master
index 128a50e..7108503 100644 (file)
@@ -7,8 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites':
           trigger_jobs:
index 81f5b59..3a574a5 100644 (file)
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
     branch: 'master'
     build-node: ubuntu1604-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
+
+- project:
+    name: dcaegen2-collectors-hv-ves-info
+    project-name: dcaegen2-collectors-hv-ves
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/collectors/hv-ves
+    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
new file mode 100644 (file)
index 0000000..5720a64
--- /dev/null
@@ -0,0 +1,14 @@
+- project:
+    name: dcaegen2-collectors-restconf-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-collectors-restconf'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+            - '{project-name}-{stream}-merge-java'
+    robot-options: ''
index 4a704fb..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
     project-name: 'dcaegen2-collectors-restconf'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
+
+- project:
+    name: dcaegen2-collectors-restconf-info
+    project-name: dcaegen2-collectors-restconf
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/collectors/restconf
+    branch: master
index c002f3e..79dab04 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
+
+- project:
+    name: dcaegen2-collectors-snmptrap-info
+    project-name: dcaegen2-collectors-snmptrap
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/collectors/snmptrap
+    branch: master
index e84fb59..d7bc964 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
+
+- project:
+    name: dcaegen2-collectors-ves-info
+    project-name: dcaegen2-collectors-ves
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/collectors/ves
+    branch: master
index dad7e8b..5dee646 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
@@ -21,7 +21,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1604-docker-v1-8c-8g'
     build-timeout: 180
 
 - project:
     project-name: 'dcaegen2-deployments'
     branch: 'master'
     mvn-settings: 'dcaegen2-deployments-settings'
+
+- project:
+    name: dcaegen2-deployments-info
+    project-name: dcaegen2-deployments
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/deployments
+    branch: master
index 9eefd66..285d4e0 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-platform-blueprints'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
+
+- project:
+    name: dcaegen2-platform-blueprints-info
+    project-name: dcaegen2-platform-blueprints
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/blueprints
+    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
deleted file mode 100644 (file)
index 64849c3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-cdapbroker
-    project-name: 'dcaegen2-platform-cdapbroker'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/cdapbroker'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cdapbroker-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'
-
-- project:
-    name: dcaegen2-platform-cdapbroker-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/cdapbroker
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-platform-cdapbroker'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
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..86759fe
--- /dev/null
@@ -0,0 +1,23 @@
+---
+- 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'
+    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 1b9e5c2..2130223 100644 (file)
     project-name: 'dcaegen2-platform-cli'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-cli-settings'
+
+- project:
+    name: dcaegen2-platform-cli-info
+    project-name: dcaegen2-platform-cli
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/cli
+    branch: master
index 2e4199e..8f753b4 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-platform-configbinding'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
+
+- project:
+    name: dcaegen2-platform-configbinding-info
+    project-name: dcaegen2-platform-configbinding
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/configbinding
+    branch: master
index 4bdcb9c..b6bb261 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-platform-deployment-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
+
+- project:
+    name: dcaegen2-platform-deployment-handler-info
+    project-name: dcaegen2-platform-deployment-handler
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/deployment-handler
+    branch: master
index e2041db..d33b745 100644 (file)
@@ -16,8 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-platform-inventory-api'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
+
+- project:
+    name: dcaegen2-platform-inventory-api-info
+    project-name: dcaegen2-platform-inventory-api
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/inventory-api
+    branch: master
index 9153531..3909a23 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-platform-plugins'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-plugins-settings'
+
+- project:
+    name: dcaegen2-platform-plugins-info
+    project-name: dcaegen2-platform-plugins
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/plugins
+    branch: master
index 258bb47..cb19425 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-platform-policy-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
+
+- project:
+    name: dcaegen2-platform-policy-handler-info
+    project-name: dcaegen2-platform-policy-handler
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/policy-handler
+    branch: master
index e46df4e..a91af7a 100644 (file)
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     project-name: 'dcaegen2-platform-servicechange-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
+
+- project:
+    name: dcaegen2-platform-servicechange-handler-info
+    project-name: dcaegen2-platform-servicechange-handler
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/platform/servicechange-handler
+    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
new file mode 100644 (file)
index 0000000..94e7e2e
--- /dev/null
@@ -0,0 +1,16 @@
+- project:
+    name: dcaegen2-bbs-event-processor-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-services-bbs-event-processor'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    functionality:
+      - 'bbs-testsuites':
+          trigger_jobs:
+            - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java'
+    robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
new file mode 100644 (file)
index 0000000..2e49ee5
--- /dev/null
@@ -0,0 +1,51 @@
+---
+- project:
+    name: dcaegen2-services-bbs-event-processor
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{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'
+          pattern: 'components/bbs-event-processor/**'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-services-bbs-event-processor-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-bbs-event-processor'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    mvn-params: '-f components/bbs-event-processor/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-bbs-event-processor-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-bbs-event-processor-clm'
+    mvn-params: '-f components/bbs-event-processor/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
new file mode 100644 (file)
index 0000000..1c5ad80
--- /dev/null
@@ -0,0 +1,37 @@
+---
+- project:
+    name: dcaegen2-services-datalake-handler
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
+            version-properties: 'components/datalake-handler/version.properties'
+    subproject:
+      - 'datalake-handler':
+          pom: 'components/datalake-handler/pom.xml'
+          pattern: 'components/datalake-handler/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-services-datalake-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    mvn-params: '-f components/datalake-handler/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 3c08887..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
     project-name: 'dcaegen2-services-heartbeat'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
+
+- project:
+    name: dcaegen2-services-heartbeat-info
+    project-name: dcaegen2-services-heartbeat
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/services/heartbeat
+    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-java.yaml b/jjb/dcaegen2/dcaegen2-services-java.yaml
new file mode 100644 (file)
index 0000000..dc04759
--- /dev/null
@@ -0,0 +1,11 @@
+---
+- project:
+    name: dcaegen2-services-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1604-docker-4c-4g
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
index 1ff1adb..e319e68 100644 (file)
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
     project-name: 'dcaegen2-services-mapper'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-mapper-settings'
+
+- project:
+    name: dcaegen2-services-mapper-info
+    project-name: dcaegen2-services-mapper
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/services/mapper
+    branch: master
index 748dfb0..0d6687f 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -21,7 +23,7 @@
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
       - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean install dockerfile:build dockerfile:push'
+          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
           script: '/bin/true'
 
 - project:
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
+
+- project:
+    name: dcaegen2-services-pm-mapper-info
+    project-name: dcaegen2-services-pm-mapper
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/services/pm-mapper
+    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
new file mode 100644 (file)
index 0000000..1d4bcf2
--- /dev/null
@@ -0,0 +1,18 @@
+- project:
+    name: dcae-bulkpm-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-pmmapper'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+
+    functionality:
+      - 'pmmapper':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+    branch: 'master'
index 344ee53..8e3047f 100644 (file)
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
     project-name: 'dcaegen2-services-prh'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-prh-settings'
+
+- project:
+    name: dcaegen2-services-prh-info
+    project-name: dcaegen2-services-prh
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/services/prh
+    branch: master
index 16a93cd..2c12df9 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-sdk-settings'
+
+- project:
+    name: dcaegen2-services-sdk-info
+    project-name: dcaegen2-services-sdk
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/services/sdk
+    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
new file mode 100644 (file)
index 0000000..b4d2b5c
--- /dev/null
@@ -0,0 +1,53 @@
+---
+- project:
+    name: dcaegen2-services-son-handler
+    project-name: 'dcaegen2-services-son-handler'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/services/son-handler'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    mvn-settings: 'dcaegen2-services-son-handler-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
+    maven-deploy-properties: |
+      deployAtEnd=true
+
+- project:
+    name: dcaegen2-services-son-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/services/son-handler'
+    project-name: 'dcaegen2-services-son-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-son-handler-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-son-handler-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/services/son-handler
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-services-son-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-son-handler-settings'
+
+- project:
+    name: dcaegen2-services-son-handler-info
+    project-name: dcaegen2-services-son-handler
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/services/son-handler
+    branch: master
index f817e4f..d91b378 100644 (file)
@@ -13,8 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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
     project-name: 'dcaegen2-utils'
     branch: 'master'
     mvn-settings: 'dcaegen2-utils-settings'
+
+- project:
+    name: dcaegen2-utils-info
+    project-name: dcaegen2-utils
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2/utils
+    branch: master
similarity index 72%
rename from jjb/dcaegen2/dcaegen2-csit.yaml
rename to jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index 6962c62..4c610e1 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: dcaegen2-testsuites-csit
+    name: dcaegen2-collectors-ves-testsuites-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
@@ -7,12 +7,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites'
     trigger_jobs:
-      - 'dcaegen2-master-merge-java'
       - 'dcaegen2-collectors-ves-master-merge-java'
     robot-options: ''
 - project:
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'prh-testsuites'
     trigger_jobs:
-      - 'dcaegen2-{stream}-merge-java'
-      - '{project-name}-{stream}-merge-java'
+      - 'dcaegen2-services-prh-master-merge-java'
     robot-options: ''
index 17d372e..9987f57 100644 (file)
@@ -17,8 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     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
     project-name: 'dcaegen2'
     branch: 'master'
     mvn-settings: 'dcaegen2-settings'
+
+- project:
+    name: dcaegen2-info
+    project-name: dcaegen2
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dcaegen2
+    branch: master
index bf7f87f..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'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''
     mvn-settings: 'demo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: demo-info
+    project-name: demo
+    jobs:
+      - gerrit-info-yaml-verify
+    project: demo
+    branch: master
index 1929eb0..2420436 100644 (file)
@@ -17,7 +17,7 @@
 #     - '{project-name}-{stream}-docker-java-daily':
 # doesn't support mvn-goals override, so trying this...
       - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package -P docker docker:build -DpushImage'
+          mvn-goals: 'clean package -P docker docker:build docker:push'
           # No-op
           script: '/bin/true'
           build-node: 'ubuntu1604-docker-8c-8g'
     project-name: 'dmaap-buscontroller'
     branch: 'master'
     mvn-settings: 'dmaap-buscontroller-settings'
+
+- project:
+    name: dmaap-buscontroller-info
+    project-name: dmaap-buscontroller
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/buscontroller
+    branch: master
index 3a54b42..e1cabcf 100644 (file)
       - 'dr-suite':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+
+- project:
+    name: dmaap-datarouter-csit-ssl
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dmaap-datarouter'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
       - 'ssl-dr-suite':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
index e75defd..ac8aade 100644 (file)
@@ -10,7 +10,7 @@
       #     - '{project-name}-{stream}-docker-java-daily':
       # doesn't support mvn-goals override, so trying this...
       - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package -P docker docker:build -DpushImage'
+          mvn-goals: 'clean package -P docker docker:build docker:push'
           # No-op
           script: '/bin/true'
           build-node: 'ubuntu1604-docker-8c-8g'
     stream:
       - 'master':
           branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: dmaap-datarouter-casablanca
+    project-name: 'dmaap-datarouter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      #
+      # see DMAAP-334 for more details, but
+      #     - '{project-name}-{stream}-docker-java-daily':
+      # doesn't support mvn-goals override, so trying this...
+      - '{project-name}-{stream}-docker-java-shell-daily':
+            mvn-goals: 'clean package -P docker docker:build -DpushImage'
+            # No-op
+            script: '/bin/true'
+            build-node: 'ubuntu1604-docker-8c-8g'
+
+    project: 'dmaap/datarouter'
+    stream:
       - 'casablanca':
           branch: 'casablanca'
     mvn-settings: 'dmaap-datarouter-settings'
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
+
+- project:
+    name: dmaap-datarouter-info
+    project-name: dmaap-datarouter
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/datarouter
+    branch: master
index 131a47b..5fd25b9 100644 (file)
     project-name: 'dmaap-dbcapi'
     branch: 'master'
     mvn-settings: 'dmaap-dbcapi-settings'
+
+- project:
+    name: dmaap-dbcapi-info
+    project-name: dmaap-dbcapi
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/dbcapi
+    branch: master
index 39202f2..b6a9ac7 100644 (file)
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
     build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: dmaap-kafka-docker-info
+    project-name: dmaap-kafka-docker
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/kafka11aaf
+    branch: master
index 088b130..7b1573c 100644 (file)
     mvn-settings: 'dmaap-kafka11aaf-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-kafka-info
+    project-name: dmaap-kafka
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/kafka11aaf
+    branch: master
index 60cc6ec..b5db723 100644 (file)
     project-name: 'dmaap-messagerouter-dmaapclient'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+
+- project:
+    name: dmaap-messagerouter-dmaapclient-info
+    project-name: dmaap-messagerouter-dmaapclient
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/messagerouter/dmaapclient
+    branch: master
index d6d12b3..f2cf27a 100644 (file)
     build-node: ubuntu1604-docker-8c-8g
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+
+- project:
+    name: dmaap-messagerouter-docker-info
+    project-name: dmaap-messagerouter-docker
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/messagerouter/messageservice
+    branch: master
index d3b9e29..828c1af 100644 (file)
     project-name: 'dmaap-messagerouter-messageservice'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+
+- project:
+    name: dmaap-messagerouter-messageservice-info
+    project-name: dmaap-messagerouter-messageservice
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/messagerouter/messageservice
+    branch: master
index c6df588..91cde72 100644 (file)
     project-name: 'dmaap-messagerouter-mirroragent'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+
+- project:
+    name: dmaap-messagerouter-mirroragent-info
+    project-name: dmaap-messagerouter-mirroragent
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/messagerouter/mirroragent
+    branch: master
index 5789d12..ba26428 100644 (file)
     project-name: 'dmaap-messagerouter-msgrtr'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+
+- project:
+    name: dmaap-messagerouter-msgrtr-info
+    project-name: dmaap-messagerouter-msgrtr
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/messagerouter/msgrtr
+    branch: master
index 8d5dfe3..de9855c 100644 (file)
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
     build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: dmaap-zookeeper-info
+    project-name: dmaap-zookeeper
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/zookeeper
+    branch: master
index 8515d73..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'
           branch: 'beijing'
       - casablanca:
           branch: 'casablanca'
+      - dublin:
+          branch: 'dublin'
+
+- project:
+    name: doc-info
+    project-name: doc
+    jobs:
+      - gerrit-info-yaml-verify
+    project: doc
+    branch: master
index bdd1541..66e40e5 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          sign-artifacts: true
+          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'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
@@ -21,8 +28,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'externalapi-nbi-settings'
     files: '**'
     archive-artifacts: ''
@@ -55,8 +60,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'externalapi-nbi-settings'
 
 - project:
     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'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: externalapi-nbi-info
+    project-name: externalapi-nbi
+    jobs:
+      - gerrit-info-yaml-verify
+    project: externalapi/nbi
+    branch: master
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 b7a56af..c783015 100644 (file)
             <goVersion>Golang 1.11</goVersion>
             </org.jenkinsci.plugins.golang.GolangBuildWrapper>
 
+- wrapper:
+    name: golang112
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+            <goVersion>Golang 1.12</goVersion>
+            </org.jenkinsci.plugins.golang.GolangBuildWrapper>
+
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.
index 9f9bdf9..40c5170 100644 (file)
@@ -1,40 +1,71 @@
 ---
-# 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 TEMPLATES #
+#################
+
+- 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
           settings-file: '{mvn-settings}'
       - docker-login
       - shell: '{script}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
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 6c139dd..12ce9a3 100644 (file)
     submodule-recursive: true
 
     # default params for helm jobs
-    pre_build_script: ''
     build_script: ''
+    git-url: '$GIT_URL/$PROJECT'
     post_build_script: ''
+    pre_build_script: ''
+    submodule-disable: false
+    submodule-recursive: true
     submodule-timeout: 10
 
     #####################
       - shell: '{obj:post_build_script}'
       - lf-provide-maven-settings-cleanup
 
+- job-template:
+    name: '{project-name}-{stream}-verify-external-helm'
+    # Job template for helm verify jobs
+
+    <<: *helm_job_boiler_plate
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: 'oom'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
+          refspec: '$GERRIT_BRANCH'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
+          choosing-strategy: default
+
+    triggers:
+      - gerrit-trigger-helm-patch-submitted:
+          status-context: '{project}-Helm-Verify'
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - lf-infra-pre-build
+      - inject:
+          properties-content: 'HELM_MODULE={helm-module}'
+      - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+
+- job-template:
+    name: '{project-name}-{stream}-merge-external-helm'
+    # Job template for Helm merge jobs
+
+    <<: *helm_job_boiler_plate
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: 'oom'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
+          refspec: '$GERRIT_BRANCH'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
+          choosing-strategy: default
+
+    triggers:
+      - gerrit-trigger-helm-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - lf-infra-pre-build
+      - inject:
+          properties-content: 'HELM_MODULE={helm-module}'
+      - lf-provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+      - lf-infra-create-netrc:
+          server-id: oom-helm
+      - inject:
+          properties-content: |
+            BUILD_TYPE=snapshot
+      - shell: '{obj:post_build_script}'
+      - lf-provide-maven-settings-cleanup
+
 - job-template:
     name: '{project-name}-{stream}-stage-helm'
     # Job template for Helm stage jobs
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
index 70d8c09..c7fe3cf 100644 (file)
     project-type: freestyle
     node: '{build-node}'
     disabled: '{disabled}'
+    version-properties: 'version.properties'
     maven-deploy-properties:
     properties:
       - infra-properties:
           settings-file: '{mvn-settings}'
 
       - inject:
-          properties-file: version.properties
+          properties-file: '{version-properties}'
       - maven-set-release-version:
           maven-version: '{maven-version}'
           mvn-settings: '{mvn-settings}'
index fe37740..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:
     project-name: 'holmes-common'
     branch: 'master'
     mvn-settings: 'holmes-common-settings'
+
+- project:
+    name: holmes-common-info
+    project-name: holmes-common
+    jobs:
+      - gerrit-info-yaml-verify
+    project: holmes/common
+    branch: master
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
deleted file mode 100644 (file)
index 82e03fe..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: holmes-dsa
-    project-name: 'holmes-dsa'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'holmes/dsa'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'holmes-dsa-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: holmes-dsa-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'holmes/dsa'
-    project-name: 'holmes-dsa'
-    branch: 'master'
-    mvn-settings: 'holmes-dsa-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: holmes-dsa-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: holmes/dsa
-    project-name: 'holmes-dsa'
-    branch: 'master'
-    mvn-settings: 'holmes-dsa-settings'
index fb36947..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
     project-name: 'holmes-engine-management'
     branch: 'master'
     mvn-settings: 'holmes-engine-management-settings'
+
+- project:
+    name: holmes-engine-management-info
+    project-name: holmes-engine-management
+    jobs:
+      - gerrit-info-yaml-verify
+    project: holmes/engine-management
+    branch: master
index 42f82ba..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
     project-name: 'holmes-rule-management'
     branch: 'master'
     mvn-settings: 'holmes-rule-management-settings'
+
+- project:
+    name: holmes-rule-management-info
+    project-name: holmes-rule-management
+    jobs:
+      - gerrit-info-yaml-verify
+    project: holmes/rule-management
+    branch: master
index 70804c4..a7fe916 100644 (file)
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     functionality:
       - 'functionality1':
           trigger_jobs:
index 175dffa..b656b4f 100644 (file)
           branch: 'master'
     mvn-settings: 'integration-devtool-settings'
     build-node: ubuntu1604-builder-2c-1g
+
+- project:
+    name: integration-devtool-info
+    project-name: integration-devtool
+    jobs:
+      - gerrit-info-yaml-verify
+    project: integration/devtool
+    branch: master
index 6bdf288..8fea30f 100644 (file)
@@ -9,8 +9,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     subproject:
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
index cb253c6..714878e 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: 'version-manifest/pom.xml'
+          mvn-params: '-f version-manifest/pom.xml'
     project: 'integration'
     subproject:
       - 'version-manifest':
@@ -20,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'integration-settings'
+
+- project:
+    name: integration-info
+    project-name: integration
+    jobs:
+      - gerrit-info-yaml-verify
+    project: integration
+    branch: master
index c5b69ba..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'
     build-node: ubuntu1604-builder-4c-4g
     maven-version: 'mvn35'
 
-- project:
-    name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-    project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-    jobs:
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: logging-analytics/pomba/pomba-aai-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-
-    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    maven-version: 'mvn35'
-
+#- project:
+#    name: logging-analytics-pomba-pomba-arm64-aai-context-builder
+#    project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: logging-analytics/pomba/pomba-aai-context-builder
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#
+#    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    maven-version: 'mvn35'
+#
 - project:
     name: logging-analytics-pomba-pomba-aai-context-builder-sonar
     jobs:
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 ad3af90..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'
     build-node: ubuntu1604-builder-4c-4g
     maven-version: 'mvn35'
 
-- project:
-    name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-    project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-    jobs:
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    maven-version: 'mvn35'
-
+#- project:
+#    name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
+#    project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: logging-analytics/pomba/pomba-network-discovery-context-builder
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#      - 'casablanca':
+#          branch: 'casablanca'
+#    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    maven-version: 'mvn35'
+#
 - project:
     name: logging-analytics-pomba-pomba-network-discovery-context-builder-sonar
     jobs:
index 685b4c6..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'
     build-node: ubuntu1604-builder-4c-4g
     maven-version: 'mvn35'
 
-- project:
-    name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-    project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-    jobs:
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: logging-analytics/pomba/pomba-sdc-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    maven-version: 'mvn35'
-
+#- project:
+#    name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
+#    project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: logging-analytics/pomba/pomba-sdc-context-builder
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    maven-version: 'mvn35'
+#
 - project:
     name: logging-analytics-pomba-pomba-sdc-context-builder-sonar
     jobs:
index 3525bb0..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'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-    jobs:
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
+#    project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: logging-analytics/pomba/pomba-sdnc-context-builder
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar
     jobs:
index dcbd07a..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'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: logging-analytics-arm64
-    project-name: 'logging-analytics-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'logging-analytics'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'logging-analytics-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: logging-analytics-arm64
+#    project-name: 'logging-analytics-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'logging-analytics'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#      - 'casablanca':
+#          branch: 'casablanca'
+#    mvn-settings: 'logging-analytics-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: logging-analytics-sonar
     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
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
     files: '**'
diff --git a/jjb/modeling/build-modeling-genericparser-docker-image.sh b/jjb/modeling/build-modeling-genericparser-docker-image.sh
new file mode 100644 (file)
index 0000000..d570d18
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./docker/*.*
+
+./docker/build_image.sh
+
@@ -1,14 +1,13 @@
 ---
 - project:
-    name: vfc-gvnfm-vnfmgr-csit
+    name: modeling-genericparser-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfmgr'
+    project-name: 'modeling-genericparser'
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs: 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily'
+          trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
-
+    branch: 'master'
\ No newline at end of file
diff --git a/jjb/modeling/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-toscaparsers-genericparser.yaml
new file mode 100644 (file)
index 0000000..f21e60c
--- /dev/null
@@ -0,0 +1,60 @@
+---
+
+- project:
+    name: modeling-genericparser
+    project-name: 'modeling-genericparser'
+    project: 'modeling/genericparser'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'modeling-genericparser-settings'
+    subproject:
+      - 'genericparser':
+          path: '.'
+          pattern: '**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-modeling-genericparser-docker-image.sh'
+          build-node: ubuntu1604-docker-8c-8g
+    files: '**'
+    archive-artifacts: ''
+    build-node: centos7-redis-4c-4g
+
+- project:
+    name: modeling-genericparser-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: centos7-redis-4c-4g
+    project: 'modeling/genericparser'
+    project-name: 'modeling-genericparser'
+    branch: 'master'
+    mvn-settings: 'modeling-genericparser-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: modeling-genericparser-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: modeling/genericparser
+    project-name: 'modeling-genericparser'
+    build-node: centos7-redis-4c-4g
+    branch: 'master'
+    mvn-settings: 'modeling-genericparser-settings'
+
+- project:
+    name: modeling-genericparser-info
+    project-name: modeling-genericparser
+    jobs:
+      - gerrit-info-yaml-verify
+    project: modeling/genericparser
+    branch: master
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
deleted file mode 100644 (file)
index 5b72b09..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
----
-- project:
-    name: modeling-project-view
-    project-name: modeling
-    views:
-      - project-view
-
-- project:
-    name: modeling-toscaparsers-javatoscachecker
-    project-name: 'modeling-toscaparsers-javatoscachecker'
-    project: 'modeling/toscaparsers'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'modeling-toscaparsers-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    subproject:
-      - 'javatoscachecker':
-          pattern: 'javatoscachecker/**'
-          pom: 'javatoscachecker/pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DontSetVersion'
-         docker-pom: 'javatoscachecker/pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-Dmaven.test.skip=true'
-         maven-properties: |
-          skip.docker.build=false
-          skip.docker.tag=false
-          skip.docker.push=false
-
-- project:
-    name: modeling-toscaparsers-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'modeling/toscaparsers'
-    project-name: 'modeling-toscaparsers'
-    branch: 'master'
-    mvn-params: '-f javatoscachecker/pom.xml'
-    mvn-settings: 'modeling-toscaparsers-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: modeling-toscaparsers-javatoscachecker-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f javatoscachecker/pom.xml'
-    nexus-iq-namespace: 'onap-'
-    project: modeling/toscaparsers
-    project-name: 'modeling-toscaparsers-javatoscachecker'
-    build-node: ubuntu1604-docker-8c-8g
-    branch: 'master'
-    mvn-settings: 'modeling-toscaparsers-settings'
index a86a178..7529485 100644 (file)
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: msb-apigateway-arm64
-    project-name: 'msb-apigateway-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-apigateway-docker-image.sh'
-
-    project: 'msb/apigateway'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-apigateway-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: msb-apigateway-arm64
+#    project-name: 'msb-apigateway-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-apigateway-docker-image.sh'
+#
+#    project: 'msb/apigateway'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'msb-apigateway-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: msb-apigateway-sonar
     jobs:
     project-name: 'msb-apigateway'
     branch: 'master'
     mvn-settings: 'msb-apigateway-settings'
+
+- project:
+    name: msb-apigateway-info
+    project-name: msb-apigateway
+    jobs:
+      - gerrit-info-yaml-verify
+    project: msb/apigateway
+    branch: master
index 5397648..fe84a2c 100644 (file)
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: msb-discovery-arm64
-    project-name: 'msb-discovery-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-discovery-docker-image.sh'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-    project: 'msb/discovery'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
-    files: '**'
-    archive-artifacts: ''
-
+#- project:
+#    name: msb-discovery-arm64
+#    project-name: 'msb-discovery-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-discovery-docker-image.sh'
+#          build-node: ubuntu1604-docker-arm64-4c-2g
+#    project: 'msb/discovery'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'msb-discovery-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#
 - project:
     name: msb-discovery-sonar
     jobs:
     project-name: 'msb-discovery'
     branch: 'master'
     mvn-settings: 'msb-discovery-settings'
+
+- project:
+    name: msb-discovery-info
+    project-name: msb-discovery
+    jobs:
+      - gerrit-info-yaml-verify
+    project: msb/discovery
+    branch: master
index 537f1f4..5394ba1 100644 (file)
     project-name: 'msb-java-sdk'
     branch: 'master'
     mvn-settings: 'msb-java-sdk-settings'
+
+- project:
+    name: msb-java-sdk-info
+    project-name: msb-java-sdk
+    jobs:
+      - gerrit-info-yaml-verify
+    project: msb/java-sdk
+    branch: master
index 476dee3..732d618 100644 (file)
     project-name: 'msb-swagger-sdk'
     branch: 'master'
     mvn-settings: 'msb-swagger-sdk-settings'
+
+- project:
+    name: msb-swagger-sdk-info
+    project-name: msb-swagger-sdk
+    jobs:
+      - gerrit-info-yaml-verify
+    project: msb/swagger-sdk
+    branch: master
index b749b30..9d78d73 100755 (executable)
@@ -6,5 +6,7 @@ CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
 chmod 755 ./multivimbroker/docker/*.*
+chmod 755 ./artifactbroker/docker/*.*
 
-./multivimbroker/docker/build_image.sh
\ No newline at end of file
+./multivimbroker/docker/build_image.sh
+./artifactbroker/docker/build_image.sh
\ No newline at end of file
index 26842cb..5ae8828 100755 (executable)
@@ -5,14 +5,16 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./newton/docker/*.*
 chmod 755 ./ocata/docker/*.*
 chmod 755 ./windriver/docker/*.*
 chmod 755 ./pike/docker/*.*
 chmod 755 ./starlingx/docker/*.*
+chmod 755 ./lenovo/docker/*.*
+chmod 755 ./fcaps/docker/*.*
 
-./newton/docker/build_image.sh
 ./ocata/docker/build_image.sh
 ./windriver/docker/build_image.sh
 ./pike/docker/build_image.sh
 ./starlingx/docker/build_image.sh
+./lenovo/docker/build_image.sh
+./fcaps/docker/build_image.sh
index 520a97a..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'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-2g
 
-- project:
-    name: multicloud-azure-arm64-java
-    project-name: 'multicloud-azure-arm64'
-    project: 'multicloud/azure'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-azure-settings'
-    subproject:
-      - 'azure':
-          pom: 'azure/pom.xml'
-          pattern: 'azure/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: multicloud-azure-arm64-java
+#    project-name: 'multicloud-azure-arm64'
+#    project: 'multicloud/azure'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-azure-settings'
+#    subproject:
+#      - 'azure':
+#          pom: 'azure/pom.xml'
+#          pattern: 'azure/**'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: multicloud-azure-sonar
     jobs:
     project-name: 'multicloud-azure'
     branch: 'master'
     mvn-settings: 'multicloud-azure-settings'
+
+- project:
+    name: multicloud-azure-info
+    project-name: multicloud-azure
+    jobs:
+      - gerrit-info-yaml-verify
+    project: multicloud/azure
+    branch: master
index d59d92e..c2b72cf 100644 (file)
       - 'multivimbroker':
           pom: 'multivimbroker/pom.xml'
           pattern: 'multivimbroker/**'
+      - 'artifactbroker':
+          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'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+#- project:
+#    name: multicloud-framework-arm64-java
+#    project-name: 'multicloud-framework-arm64'
+#    project: 'multicloud/framework'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-framework-settings'
+#    subproject:
+#      - 'multivimbroker':
+#          pom: 'multivimbroker/pom.xml'
+#          pattern: 'multivimbroker/**'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
-    name: multicloud-framework-arm64-java
-    project-name: 'multicloud-framework-arm64'
+    name: multicloud-framework-multivimbroker-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/framework'
-    stream:
-      - 'master':
-          branch: 'master'
+    project-name: 'multicloud-framework-multivimbroker'
+    branch: 'master'
+    mvn-params: '-f multivimbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
-    subproject:
-      - 'multivimbroker':
-          pom: 'multivimbroker/pom.xml'
-          pattern: 'multivimbroker/**'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-framework-multivimbroker-clm
     jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: multicloud/framework
+    project-name: 'multicloud-framework-multivimbroker'
+    branch: 'master'
+    mvn-params: '-f multivimbroker/pom.xml'
+    mvn-settings: 'multicloud-framework-settings'
 
 - project:
-    name: multicloud-framework-sonar
+    name: multicloud-framework-artifactbroker-sonar
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/framework'
-    project-name: 'multicloud-framework'
+    project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
-    name: multicloud-framework-java-clm
+    name: multicloud-framework-artifactbroker-clm
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: multicloud/framework
-    project-name: 'multicloud-framework'
+    project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
similarity index 57%
rename from jjb/vnfsdk/vnfsdk-ice-csit.yaml
rename to jjb/multicloud/multicloud-k8s-csit.yaml
index 3fc35c9..a5a1540 100644 (file)
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: vnfsdk-ice-csit
+    name: multicloud-k8s-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vnfsdk-ice'
+    project-name: 'multicloud-k8s'
     stream: 'master'
     functionality:
-      - 'sanity-check':
-          trigger_jobs:
+      - 'functionality1':
+          trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily'
     robot-options: ''
     branch: 'master'
index 4131c7f..d4aa0be 100644 (file)
@@ -3,7 +3,7 @@
     name: multicloud-k8s
     project-name: 'multicloud-k8s'
     path: 'src/k8splugin'
-    golangver: 'golang111'
+    golangver: 'golang112'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-golang'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+#- project:
+#    name: multicloud-k8s-arm64
+#    project-name: 'multicloud-k8s-arm64'
+#    path: 'src/k8splugin'
+#    golangver: 'golang112'
+#    jobs:
+#      - '{project-name}-{stream}-docker-golang-shell-daily':
+#          script:
+#            !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
+#    project: 'multicloud/k8s'
+#    subproject:
+#      - validation-scripts:
+#          path: '.'
+#          pattern: '**'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-k8s-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+
 - project:
-    name: multicloud-k8s-arm64
-    project-name: 'multicloud-k8s-arm64'
-    path: 'src/k8splugin'
-    golangver: 'golang111'
+    name: multicloud-k8s-info
+    project-name: multicloud-k8s
     jobs:
-      - '{project-name}-{stream}-docker-golang-shell-daily':
-          script:
-            !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
-    project: 'multicloud/k8s'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-k8s-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
+      - gerrit-info-yaml-verify
+    project: multicloud/k8s
+    branch: master
diff --git a/jjb/multicloud/multicloud-openstack-casablanca.yaml b/jjb/multicloud/multicloud-openstack-casablanca.yaml
deleted file mode 100644 (file)
index bbe90c5..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- project:
-    name: multicloud-openstack-casablanca
-    project-name: 'multicloud-openstack-casablanca'
-    project: 'multicloud/openstack'
-    stream:
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'multicloud-openstack-settings'
-    subproject:
-      - 'newton':
-          path: 'newton'
-          pattern: 'newton/**'
-          pom: 'newton/pom.xml'
-      - 'newton_share':
-          path: 'newton'
-          pattern: 'share/**'
-          pom: 'newton/pom.xml'
-      - 'ocata':
-          path: 'ocata'
-          pattern: 'ocata/**'
-          pom: 'ocata/pom.xml'
-      - 'ocata_share':
-          path: 'ocata'
-          pattern: 'share/**'
-          pom: 'ocata/pom.xml'
-      - 'pike':
-          path: 'pike'
-          pattern: 'pike/**'
-          pom: 'pike/pom.xml'
-      - 'pike_share':
-          path: 'pike'
-          pattern: 'share/**'
-          pom: 'pike/pom.xml'
-      - 'windriver':
-          path: 'windriver'
-          pattern: 'windriver/**'
-          pom: 'windriver/pom.xml'
-    jobs:
-      - '{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'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-memcached-4c-4g'
-
-
@@ -1,12 +1,13 @@
+---
 - project:
-    name: usecase-ui-server-csit
+    name: multicloud-openstack-fcaps-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecase-ui-server'
+    project-name: 'multicloud-fcaps'
     stream: 'master'
     functionality:
-      - 'testsuite':
-          trigger_jobs: '{project-name}-{stream}-docker-java-daily'
+      - 'functionality1':
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
@@ -1,13 +1,13 @@
----
-- project:
-    name: modeling-toscaparsers-javatoscachecker-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'modeling-toscaparsers-javatoscachecker'
-    stream: 'master'
-    functionality:
-      - 'APIs':
-          trigger_jobs: '{project-name}-{stream}-release-version-java-daily'
-    robot-options: ''
-    branch: 'master'
+---\r
+- project:\r
+    name: multicloud-openstack-lenovo-csit\r
+    jobs:\r
+      - '{project-name}-{stream}-verify-csit-{functionality}'\r
+      - '{project-name}-{stream}-csit-{functionality}'\r
+    project-name: 'multicloud-lenovo'\r
+    stream: 'master'\r
+    functionality:\r
+      - 'functionality1':\r
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'\r
+    robot-options: ''\r
+    branch: 'master'\r
index 374b27f..d44ac3c 100644 (file)
       - 'functionality1':
           trigger_jobs:
             - 'multicloud-openstack-master-docker-java-version-shell-daily'
-            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
+#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
       - 'hpa-discovery':
           trigger_jobs:
             - 'multicloud-openstack-master-docker-java-version-shell-daily'
-            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
+#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index c8a6cd8..2e36856 100644 (file)
@@ -10,6 +10,6 @@
       - 'functionality1':
           trigger_jobs:
             - 'multicloud-openstack-master-docker-java-version-shell-daily'
-            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
+#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index 4c56a37..4becc19 100644 (file)
@@ -10,6 +10,6 @@
       - 'functionality1':
           trigger_jobs:
             -  'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
-            -  'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily'
+#            -  'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index 3c8be8a..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'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: multicloud-openstack-vmware-arm64-java
-    project-name: 'multicloud-openstack-vmware-arm64'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    subproject:
-      - 'vio':
-          pom: 'vio/pom.xml'
-          pattern: 'vio/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-    files: '**'
-    archive-artifacts: ''
-
+#- project:
+#    name: multicloud-openstack-vmware-arm64-java
+#    project-name: 'multicloud-openstack-vmware-arm64'
+#    project: 'multicloud/openstack/vmware'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-openstack-vmware-settings'
+#    subproject:
+#      - 'vio':
+#          pom: 'vio/pom.xml'
+#          pattern: 'vio/**'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
+#          build-node: ubuntu1604-docker-arm64-4c-2g
+#    files: '**'
+#    archive-artifacts: ''
+#
 - project:
     name: multicloud-openstack-vmware-sonar
     jobs:
     project-name: 'multicloud-openstack-vmware'
     branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'
+
+- project:
+    name: multicloud-openstack-vmware-info
+    project-name: multicloud-openstack-vmware
+    jobs:
+      - gerrit-info-yaml-verify
+    project: multicloud/openstack/vmware
+    branch: master
index 6718c4d..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'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: multicloud-openstack-vmware-vesagent-arm64-java
-    project-name: 'multicloud-openstack-vmware-vesagent-arm64'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    subproject:
-      - 'vesagent':
-          pom: 'vesagent/pom.xml'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-    files: '**'
-    archive-artifacts: ''
+#- project:
+#    name: multicloud-openstack-vmware-vesagent-arm64-java
+#    project-name: 'multicloud-openstack-vmware-vesagent-arm64'
+#    project: 'multicloud/openstack/vmware'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-openstack-vmware-settings'
+#    subproject:
+#      - 'vesagent':
+#          pom: 'vesagent/pom.xml'
+#          pattern: 'vesagent/**'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
+#          build-node: ubuntu1604-docker-arm64-4c-2g
+#    files: '**'
+#    archive-artifacts: ''
index 1dbac83..9947419 100644 (file)
           branch: 'master'
     mvn-settings: 'multicloud-openstack-settings'
     subproject:
-      - 'newton':
-          path: 'newton'
-          pattern: 'newton/**'
-          pom: 'newton/pom.xml'
-      - 'newton_share':
-          path: 'newton'
-          pattern: 'share/**'
-          pom: 'newton/pom.xml'
       - 'ocata':
           path: 'ocata'
           pattern: 'ocata/**'
           path: 'windriver'
           pattern: 'windriver/**'
           pom: 'windriver/pom.xml'
+      - 'windriver_share':
+          path: 'windriver'
+          pattern: 'share/**'
+          pom: 'windriver/pom.xml'
+      - 'fcaps':
+          path: 'fcaps'
+          pattern: 'fcaps/**'
+          pom: 'fcaps/pom.xml'
+      - 'lenovo':
+          path: 'lenovo'
+          pattern: 'lenovo/**'
+          pom: 'lenovo/pom.xml'
+      - 'lenovo_share':
+          path: 'lenovo'
+          pattern: 'share/**'
+          pom: 'lenovo/pom.xml'
     jobs:
       - '{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'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
 
-- project:
-    name: multicloud-openstack-arm64
-    project-name: 'multicloud-openstack-arm64'
-    project: 'multicloud/openstack'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-settings'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: multicloud-openstack-newton-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-newton'
-    branch: 'master'
-    mvn-params: '-f newton/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
+#- project:
+#    name: multicloud-openstack-arm64
+#    project-name: 'multicloud-openstack-arm64'
+#    project: 'multicloud/openstack'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-openstack-settings'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-version-shell-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-goals: 'install'
+#          script:
+#            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
+#          build-node: ubuntu1604-docker-arm64-4c-2g
+#    files: '**'
+#    archive-artifacts: ''
+#
 - project:
     name: multicloud-openstack-ocata-sonar
     jobs:
     build-node: ubuntu1604-memcached-4c-4g
     branch: 'master'
     mvn-settings: 'multicloud-openstack-settings'
+
+- project:
+    name: multicloud-openstack-fcaps-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-fcaps'
+    branch: 'master'
+    mvn-params: '-f fcaps/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-lenovo-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-lenovo'
+    branch: 'master'
+    mvn-params: '-f lenovo/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-info
+    project-name: multicloud-openstack
+    jobs:
+      - gerrit-info-yaml-verify
+    project: multicloud/openstack
+    branch: master
index 69fa0c4..261c94a 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: music-distributed-kv-store-info
+    project-name: music-distributed-kv-store
+    jobs:
+      - gerrit-info-yaml-verify
+    project: music/distributed-kv-store
+    branch: master
index 172d1e5..cd0e246 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: 'music/mdbc'
     stream:
     project-name: 'music-mdbc'
     branch: 'master'
     mvn-settings: 'music-mdbc-settings'
+
+- project:
+    name: music-mdbc-info
+    project-name: music-mdbc
+    jobs:
+      - gerrit-info-yaml-verify
+    project: music/mdbc
+    branch: master
index a861892..7025c95 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-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: docker
     project-name: 'music-prom'
     branch: 'master'
     mvn-settings: 'music-prom-settings'
+
+- project:
+    name: music-prom-info
+    project-name: music-prom
+    jobs:
+      - gerrit-info-yaml-verify
+    project: music/prom
+    branch: master
diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml
deleted file mode 100644 (file)
index 105dedd..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- project:
-    name: music-trigger
-    project-name: 'music'
-    subproject:
-      - 'music-trigger':
-          pom: 'musictrigger/pom.xml'
-          pattern: 'musictrigger/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    project: 'music'
-    stream:
-      - 'trigger-casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'music-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-
-- project:
-    name: music-trigger-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f musictrigger/pom.xml assembly:single'
-    nexus-iq-namespace: 'onap-'
-    project: music
-    project-name: 'music-trigger'
-    branch: 'master'
-    mvn-settings: 'music-settings'
index 6987996..816f83c 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-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: docker
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-      - 'dev-cassandra-only':
-          branch: 'dev-cassandra-only'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
     project-name: 'music'
     branch: 'master'
     mvn-settings: 'music-settings'
+
+- project:
+    name: music-info
+    project-name: music
+    jobs:
+      - gerrit-info-yaml-verify
+    project: music
+    branch: 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/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
+
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
new file mode 100644 (file)
index 0000000..7e462d2
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: offline-installer
+    project-name: 'offline-installer'
+    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}-review':
+          build_script: '{offline_review_bootstrap}'
diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml
new file mode 100644 (file)
index 0000000..5f95f70
--- /dev/null
@@ -0,0 +1,34 @@
+---
+- job-template:
+    name: '{project-name}-{stream}-review'
+    node: '{build-node}'
+    project-type: freestyle
+    build_script: ''
+    pattern: '**'
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: 'oom/{project-name}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          submodule-recursive: '{submodule-recursive}'
+          choosing-strategy: 'gerrit'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: 'oom/{project-name}'
+          branch: '{branch}'
+          files: '{obj:pattern}'
+
+    builders:
+      - shell: '{obj:build_script}'
+
+    publishers:
+      - lf-infra-publish
+
index 8e4b001..2daca91 100644 (file)
       - shell: !include-raw-escape: oneclick-config-make-tar.sh
       - shell: !include-raw-escape: oneclick-config-build-docker-image.sh
       - shell: !include-raw-escape: ../include-docker-push.sh
+
+- project:
+    name: oomconfig-info
+    project-name: oomconfig
+    jobs:
+      - gerrit-info-yaml-verify
+    project: oom
+    branch: master
index 818d010..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'
     project-name: 'oom-registrator'
     branch: 'master'
     mvn-settings: 'oom-registrator-settings'
+
+- project:
+    name: oom-registrator-info
+    project-name: oom-registrator
+    jobs:
+      - gerrit-info-yaml-verify
+    project: oom/registrator
+    branch: master
index 1fc2c4c..b5f9150 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: 'oparent'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'oparent-settings'
     files: '**'
     archive-artifacts: ''
     project-name: 'oparent'
     branch: 'master'
     mvn-settings: 'oparent-settings'
+
+- project:
+    name: oparent-info
+    project-name: oparent
+    jobs:
+      - gerrit-info-yaml-verify
+    project: oparent
+    branch: master
index f9b2385..5b240f4 100644 (file)
@@ -9,16 +9,14 @@
     name: optf-cmso
     project-name: 'optf-cmso'
     jobs:
+      - gerrit-maven-stage:
+          maven-versions-plugin: true
       - '{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'
@@ -43,7 +41,7 @@
     name: optf-cmso-sonar
     jobs:
       - gerrit-maven-sonar:
-          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001  -DskipIntegrationTests=false'
     cron: 'H 11 * * *'
     build-node: ubuntu1604-docker-8c-8g
     project: 'optf/cmso'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'optf-cmso-settings'
+
+- project:
+    name: optf-cmso-info
+    project-name: optf-cmso
+    jobs:
+      - gerrit-info-yaml-verify
+    project: optf/cmso
+    branch: master
index d5fa496..50a8035 100644 (file)
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-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
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
@@ -31,8 +32,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'optf-has-settings'
+
+- project:
+    name: optf-has-info
+    project-name: optf-has
+    jobs:
+      - gerrit-info-yaml-verify
+    project: optf/has
+    branch: master
index 762b078..0949850 100644 (file)
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
       - '{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
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
@@ -30,8 +31,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'optf-osdf-settings'
+
+- project:
+    name: optf-osdf-info
+    project-name: optf-osdf
+    jobs:
+      - gerrit-info-yaml-verify
+    project: optf/osdf
+    branch: master
diff --git a/jjb/policy/drools-apps-docker-merge.sh b/jjb/policy/drools-apps-docker-merge.sh
new file mode 100644 (file)
index 0000000..9291c0b
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO MERGE DROOLS APPLICATIONS DOCKER IMAGE ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 controlloop/build/docker-cl
+
+controlloop/build/docker-cl --merge
diff --git a/jjb/policy/drools-apps-docker-release.sh b/jjb/policy/drools-apps-docker-release.sh
new file mode 100644 (file)
index 0000000..07755b7
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO RELEASE DROOLS APPLICATIONS DOCKER IMAGE ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 controlloop/build/docker-cl
+
+controlloop/build/docker-cl --release
index aa5d49b..f23b9c1 100644 (file)
@@ -21,7 +21,7 @@
             -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:
@@ -48,7 +48,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/apex-pdp'
     stream:
     project-name: 'policy-apex-pdp'
     branch: 'master'
     mvn-settings: 'policy-apex-pdp-settings'
+
+- project:
+    name: policy-apex-pdp-info
+    project-name: policy-apex-pdp
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/apex-pdp
+    branch: master
index 9c2874b..9462909 100644 (file)
@@ -4,7 +4,16 @@
     project-name: 'policy-api'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-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:
     project-name: 'policy-api'
     branch: 'master'
     mvn-settings: 'policy-api-settings'
+
+- project:
+    name: policy-api-info
+    project-name: policy-api
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/api
+    branch: master
index d81fb7e..ccf6c75 100644 (file)
@@ -6,7 +6,7 @@
       - '{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:
@@ -24,7 +24,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
+          disabled: true
 
     project: 'policy/common'
     stream:
     project-name: 'policy-common'
     branch: 'master'
     mvn-settings: 'policy-common-settings'
+
+- project:
+    name: policy-common-info
+    project-name: policy-common
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/common
+    branch: master
diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml
deleted file mode 100644 (file)
index b9bf001..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-core
-    project-name: 'policy-core'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/core'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-core-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-core-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/core'
-    project-name: 'policy-core'
-    branch: 'master'
-    mvn-settings: 'policy-core-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-core-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/core
-    project-name: 'policy-core'
-    branch: 'master'
-    mvn-settings: 'policy-core-settings'
index 90ee700..cedbc64 100644 (file)
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'health'
     trigger_jobs:
@@ -16,6 +14,7 @@
       - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
       - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
+    build-timeout: 40
     branch: 'master'
 
 - project:
@@ -27,8 +26,6 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'apex-pdp'
     trigger_jobs:
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'distribution'
     trigger_jobs:
       - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
     branch: 'master'
+
+- project:
+    name: policy-api-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'api'
+    trigger_jobs:
+      - 'policy-api-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-xacml-pdp-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'xacml-pdp'
+    trigger_jobs:
+      - 'policy-xacml-pdp-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-pap-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'pap'
+    trigger_jobs:
+      - 'policy-pap-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-drools-pdp-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'drools-pdp'
+    trigger_jobs:
+      - 'policy-drools-pdp-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-drools-applications-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'drools-applications'
+    trigger_jobs:
+      - 'policy-drools-applications-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'
+
index 6c529c8..6c5753c 100644 (file)
@@ -12,7 +12,7 @@
           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'
@@ -37,7 +37,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'
     project-name: 'policy-distribution'
     branch: 'master'
     mvn-settings: 'policy-distribution-settings'
+
+- project:
+    name: policy-distribution-info
+    project-name: policy-distribution
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/distribution
+    branch: master
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
new file mode 100644 (file)
index 0000000..c378217
--- /dev/null
@@ -0,0 +1,56 @@
+---
+- 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
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-P docker'
+          disabled: false
+          build-node: ubuntu1604-docker-8c-8g
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: policy-docker-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/docker'
+    project-name: 'policy-docker'
+    branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-docker-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: policy/docker
+    project-name: 'policy-docker'
+    branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+
+- project:
+    name: policy-docker-info
+    project-name: policy-docker
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/docker
+    branch: master
index 7661e50..bab2c2e 100644 (file)
@@ -4,9 +4,19 @@
     project-name: 'policy-drools-applications'
     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:
@@ -24,7 +34,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
+          disabled: true
 
     project: 'policy/drools-applications'
     stream:
     project-name: 'policy-drools-applications'
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+
+- project:
+    name: policy-drools-applications-info
+    project-name: policy-drools-applications
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/drools-applications
+    branch: master
index 5e34e77..c7ab5c2 100644 (file)
@@ -15,7 +15,7 @@
             -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:
@@ -42,7 +42,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/drools-pdp'
     stream:
     project-name: 'policy-drools-pdp'
     branch: 'master'
     mvn-settings: 'policy-drools-pdp-settings'
+
+- project:
+    name: policy-drools-pdp-info
+    project-name: policy-drools-pdp
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/drools-pdp
+    branch: master
index a525538..114adb7 100644 (file)
@@ -15,7 +15,7 @@
             -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:
@@ -42,7 +42,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/engine'
     stream:
     name: policy-engine-clm
     jobs:
       - gerrit-maven-clm:
-         build-timeout: 30
+         build-timeout: 40
     nexus-iq-namespace: 'onap-'
     project: policy/engine
     project-name: 'policy-engine'
     branch: 'master'
     mvn-settings: 'policy-engine-settings'
     build-node: 'ubuntu1604-builder-4c-4g'
+
+- project:
+    name: policy-engine-info
+    project-name: policy-engine
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/engine
+    branch: master
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
deleted file mode 100644 (file)
index dd62159..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-gui
-    project-name: 'policy-gui'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/gui'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-gui-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-gui-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/gui'
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-gui-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/gui
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'
index 9d332cc..b7507ab 100644 (file)
@@ -5,6 +5,8 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily':
+          disabled: false
 
     project: 'policy/models'
     stream:
     project-name: 'policy-models'
     branch: 'master'
     mvn-settings: 'policy-models-settings'
+
+- project:
+    name: policy-models-info
+    project-name: policy-models
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/models
+    branch: master
index 0b8e733..e33bb23 100644 (file)
@@ -4,7 +4,16 @@
     project-name: 'policy-pap'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-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:
     project-name: 'policy-pap'
     branch: 'master'
     mvn-settings: 'policy-pap-settings'
+
+- project:
+    name: policy-pap-info
+    project-name: policy-pap
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/pap
+    branch: master
index 525ffe3..22c1edf 100644 (file)
@@ -6,7 +6,7 @@
       - '{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:
     project-name: 'policy-parent'
     branch: 'master'
     mvn-settings: 'policy-parent-settings'
+
+- project:
+    name: policy-parent-info
+    project-name: policy-parent
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/parent
+    branch: master
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
deleted file mode 100644 (file)
index fd93a3c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-pdp
-    project-name: 'policy-pdp'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/pdp'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-pdp-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/pdp'
-    project-name: 'policy-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-pdp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-pdp-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/pdp
-    project-name: 'policy-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-pdp-settings'
index 83e590c..1ad7b7a 100644 (file)
@@ -4,7 +4,16 @@
     project-name: 'policy-xacml-pdp'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-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:
     project-name: 'policy-xacml-pdp'
     branch: 'master'
     mvn-settings: 'policy-xacml-pdp-settings'
+
+- project:
+    name: policy-xacml-pdp-info
+    project-name: policy-xacml-pdp
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/xacml-pdp
+    branch: master
index 45a4541..d77ea9f 100644 (file)
@@ -16,8 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.4.0':
-          branch: 'release-2.4.0'
+      - 'release-2.5.0':
+          branch: 'release-2.5.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''
     project-name: 'portal-sdk'
     branch: 'master'
     mvn-settings: 'portal-sdk-settings'
+
+- project:
+    name: portal-sdk-info
+    project-name: portal-sdk
+    jobs:
+      - gerrit-info-yaml-verify
+    project: portal/sdk
+    branch: master
index 9e73050..ce944dd 100644 (file)
@@ -9,6 +9,10 @@
     name: portal
     project-name: 'portal'
     jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-java-daily'
     project: 'portal'
     stream:
     branch: 'master'
     build-node: ubuntu1604-builder-4c-4g
     mvn-settings: 'portal-settings'
+
+- project:
+    name: portal-info
+    project-name: portal
+    jobs:
+      - gerrit-info-yaml-verify
+    project: portal
+    branch: master
index 42c93cf..7ec4294 100644 (file)
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'sanity':
           trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
     html-dir: 'archives'
     html-files: 'SDC_CI_Extent_Report.html'
 
-- project:
-    name: sdc-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
-      - '{project-name}-arm64-{stream}-csit-{functionality}-testng'
-    project-name: 'sdc'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'sanity':
-          trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
-      - 'nightly':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-      - 'uiSanity':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-    robot-options: ''
-    branch: 'master'
-    html-dir: 'archives'
-    html-files: 'SDC_CI_Extent_Report.html'
+#- project:
+#    name: sdc-csit-arm64
+#    jobs:
+#      - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
+#      - '{project-name}-arm64-{stream}-csit-{functionality}-testng'
+#    project-name: 'sdc'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    functionality:
+#      - 'sanity':
+#          trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
+#      - 'nightly':
+#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+#      - 'uiSanity':
+#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+#    robot-options: ''
+#    branch: 'master'
+#    html-dir: 'archives'
+#    html-files: 'SDC_CI_Extent_Report.html'
index 5c4385b..0cd41f1 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'sdc-dcae-d-ci-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-- project:
-    name: sdc-dcae-d-ci-arm64
-    project-name: 'sdc-dcae-d-ci-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-DskipTests=true'
-         build-node: 'ubuntu1604-docker-arm64-4c-2g'
-    project: 'sdc/dcae-d/ci'
-    stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-ci-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
 
+#- project:
+#    name: sdc-dcae-d-ci-arm64
+#    project-name: 'sdc-dcae-d-ci-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#         docker-pom: 'pom.xml'
+#         mvn-profile: 'docker'
+#         mvn-params: '-DskipTests=true'
+#         build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#    project: 'sdc/dcae-d/ci'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdc-dcae-d-ci-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-timeout: 60
+#
 - project:
     name: sdc-dcae-ci-sonar
     jobs:
@@ -54,7 +54,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/ci'
     project-name: 'sdc-dcae-d-ci'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-ci-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/ci
     project-name: 'sdc-dcae-d-ci'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-ci-settings'
+
+- project:
+    name: sdc-dcae-d-ci-info
+    project-name: sdc-dcae-d-ci
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/dcae-d/ci
+    branch: master
index 3630b4d..b6e5384 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
 
-- project:
-    name: sdc-dcae-d-dt-be-main-arm64
-    project-name: 'sdc-dcae-d-dt-be-main-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true'
-    project: 'sdc/dcae-d/dt-be-main'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
+#- project:
+#    name: sdc-dcae-d-dt-be-main-arm64
+#    project-name: 'sdc-dcae-d-dt-be-main-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-DskipTests=true'
+#    project: 'sdc/dcae-d/dt-be-main'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    files: '**'
+#    archive-artifacts: ''
+#    build-timeout: 60
+#
 - project:
     name: sdc-dcae-d-dt-be-main-sonar
     jobs:
@@ -49,7 +49,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-main'
     project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/dt-be-main
     project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
+
+- project:
+    name: sdc-dcae-d-dt-be-main-info
+    project-name: sdc-dcae-d-dt-be-main
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/dcae-d/dt-be-main
+    branch: master
index 3949f62..7bc3c34 100644 (file)
@@ -10,8 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     files: '**'
     archive-artifacts: ''
@@ -25,7 +25,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-property'
     project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/dt-be-property
     project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
+
+- project:
+    name: sdc-dcae-d-dt-be-property-info
+    project-name: sdc-dcae-d-dt-be-property
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/dcae-d/dt-be-property
+    branch: master
index 6338c8c..9b83d0b 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'sdc-dcae-d-dt-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-- project:
-    name: sdc-dcae-d-dt-arm64
-    project-name: 'sdc-dcae-d-dt-arm64'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'server,docker'
-          mvn-params: '-DskipTests=true'
-    project: 'sdc/dcae-d/dt'
-    stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
 
+#- project:
+#    name: sdc-dcae-d-dt-arm64
+#    project-name: 'sdc-dcae-d-dt-arm64'
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    jobs:
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'server,docker'
+#          mvn-params: '-DskipTests=true'
+#    project: 'sdc/dcae-d/dt'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdc-dcae-d-dt-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-timeout: 60
+#
 - project:
     name: sdc-dcae-d-dt-sonar
     jobs:
@@ -50,7 +50,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt'
     project-name: 'sdc-dcae-d-dt'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     project: sdc/dcae-d/dt
     project-name: 'sdc-dcae-d-dt'
     build-node: ubuntu1604-builder-4c-2g
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
+
+- project:
+    name: sdc-dcae-d-dt-info
+    project-name: sdc-dcae-d-dt
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/dcae-d/dt
+    branch: master
index 9cc5de7..67f00ec 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'sdc-dcae-d-fe-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-- project:
-    name: sdc-dcae-d-fe-arm64
-    project-name: 'sdc-dcae-d-fe-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true'
-    project: 'sdc/dcae-d/fe'
-    stream:
-      - 'master':
-          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
 
+#- project:
+#    name: sdc-dcae-d-fe-arm64
+#    project-name: 'sdc-dcae-d-fe-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-DskipTests=true'
+#    project: 'sdc/dcae-d/fe'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdc-dcae-d-fe-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-timeout: 60
+#
 - project:
     name: sdc-dcae-d-fe-sonar
     jobs:
@@ -49,7 +49,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/fe'
     project-name: 'sdc-dcae-d-fe'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     project: sdc/dcae-d/fe
     project-name: 'sdc-dcae-d-fe'
     build-node: ubuntu1604-builder-4c-2g
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
+
+- project:
+    name: sdc-dcae-d-fe-info
+    project-name: sdc-dcae-d-fe
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/dcae-d/fe
+    branch: master
index 6b4a3b6..e718024 100644 (file)
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     subproject:
     - dcae-d-tosca-lab:
         path: '.'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 
-- project:
-    name: sdc-dcae-d-tosca-lab-arm64
-    project-name: 'sdc-dcae-d-tosca-lab-arm64'
-    project: 'sdc/dcae-d/tosca-lab'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-    - dcae-d-tosca-lab:
-        path: '.'
-        pattern: '**'
-    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    jobs:
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
-
+#- project:
+#    name: sdc-dcae-d-tosca-lab-arm64
+#    project-name: 'sdc-dcae-d-tosca-lab-arm64'
+#    project: 'sdc/dcae-d/tosca-lab'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    subproject:
+#    - dcae-d-tosca-lab:
+#        path: '.'
+#        pattern: '**'
+#    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#    docker-pom: 'pom.xml'
+#    mvn-profile: 'default'
+#
 - project:
     name: sdc-dcae-d-tosca-lab-sonar
     jobs:
     build-node: ubuntu1604-docker-8c-8g
     project: 'sdc/dcae-d/tosca-lab'
     project-name: 'sdc-dcae-d-tosca-lab'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-dcae-d-tosca-lab-info
+    project-name: sdc-dcae-d-tosca-lab
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/dcae-d/tosca-lab
+    branch: master
index e6765a4..090c215 100644 (file)
@@ -16,8 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
@@ -32,7 +32,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/jtosca'
     project-name: 'sdc-jtosca'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     nexus-iq-namespace: 'onap-'
     project: sdc/jtosca
     project-name: 'sdc-jtosca'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
+
+- project:
+    name: sdc-jtosca-info
+    project-name: sdc-jtosca
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/jtosca
+    branch: master
index 0f4155c..69c6e4a 100644 (file)
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+
+- project:
+    name: sdc-sdc-distribution-client-info
+    project-name: sdc-sdc-distribution-client
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/sdc-distribution-client
+    branch: master
index 3560a5f..03b9d2a 100644 (file)
@@ -5,33 +5,43 @@
     project-name: 'sdc-sdc-docker-base'
     jobs:
       - '{project-name}-{stream}-sdc-merge-java':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'default'
     project: 'sdc/sdc-docker-base'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
     maven-version: 'mvn35'
 
+#- project:
+#    name: sdc-sdc-docker-base-arm64
+#    project-name: 'sdc-sdc-docker-base-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-sdc-merge-java':
+#          build-node: 'ubuntu1604-docker-8c-8g'
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'default'
+#    project: 'sdc/sdc-docker-base'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdc-sdc-docker-base-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    maven-version: 'mvn35'
+
 - project:
-    name: sdc-sdc-docker-base-arm64
-    project-name: 'sdc-sdc-docker-base-arm64'
+    name: sdc-sdc-docker-base-info
+    project-name: sdc-sdc-docker-base
     jobs:
-      - '{project-name}-{stream}-sdc-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'default'
-    project: 'sdc/sdc-docker-base'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-sdc-docker-base-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    maven-version: 'mvn35'
+      - gerrit-info-yaml-verify
+    project: sdc/sdc-docker-base
+    branch: master
index 1409531..b39c9c8 100644 (file)
@@ -17,8 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     files: '**'
     archive-artifacts: ''
@@ -33,7 +33,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-pubsub'
     project-name: 'sdc-sdc-pubsub'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
index 66a86d0..92f9482 100644 (file)
     project-name: 'sdc-sdc-titan-cassandra'
     branch: 'master'
     mvn-settings: 'sdc-sdc-titan-cassandra-settings'
+
+- project:
+    name: sdc-sdc-titan-cassandra-info
+    project-name: sdc-sdc-titan-cassandra
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/sdc-titan-cassandra
+    branch: master
index 90692c7..c862ffc 100644 (file)
@@ -16,8 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
@@ -32,7 +32,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-tosca'
     project-name: 'sdc-sdc-tosca'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-tosca
     project-name: 'sdc-sdc-tosca'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
+
+- project:
+    name: sdc-sdc-tosca-info
+    project-name: sdc-sdc-tosca
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/sdc-tosca
+    branch: master
index 3049715..dcea026 100644 (file)
@@ -19,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
     maven-version: 'mvn35'
 
-- project:
-    name: sdc-sdc-workflow-designer-arm64
-    project-name: 'sdc-sdc-workflow-designer-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdc/sdc-workflow-designer'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-sdc-workflow-designer-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    maven-version: 'mvn35'
-
+#- project:
+#    name: sdc-sdc-workflow-designer-arm64
+#    project-name: 'sdc-sdc-workflow-designer-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'sdc/sdc-workflow-designer'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdc-sdc-workflow-designer-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    docker-pom: 'pom.xml'
+#    mvn-profile: docker
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    maven-version: 'mvn35'
+#
 - project:
     name: sdc-sdc-workflow-designer-sonar
     jobs:
@@ -55,7 +55,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-workflow-designer'
     project-name: 'sdc-sdc-workflow-designer'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     project: sdc/sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
     build-node: ubuntu1604-builder-4c-4g
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
+
+- project:
+    name: sdc-sdc-workflow-designer-info
+    project-name: sdc-sdc-workflow-designer
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc/sdc-workflow-designer
+    branch: master
index cfdaad2..7d70a7e 100644 (file)
@@ -30,6 +30,7 @@
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-sdc-merge-java':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
     maven-version: 'mvn35'
 
-- project:
-    name: sdc-arm64
-    project-name: 'sdc-arm64'
-    jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
-    project: 'sdc'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-settings'
-    files: '**'
-    archive-artifacts: ''
-    maven-version: 'mvn35'
-
+#- project:
+#    name: sdc-arm64
+#    project-name: 'sdc-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+#    project: 'sdc'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdc-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    maven-version: 'mvn35'
+#
 - project:
     name: sdc-sonar
     jobs:
@@ -78,7 +79,7 @@
     build-node: ubuntu1604-builder-8c-8g
     project: 'sdc'
     project-name: 'sdc'
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-settings'
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
     project: sdc
     project-name: 'sdc'
     build-node: ubuntu1604-docker-8c-8g
-    branch: 'casablanca'
+    branch: 'dublin'
     mvn-settings: 'sdc-settings'
+
+- project:
+    name: sdc-info
+    project-name: sdc
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdc
+    branch: master
index bfb97df..3cba3d9 100644 (file)
@@ -11,6 +11,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/apps'
@@ -19,6 +20,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
     files: '**'
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
-
-- project:
-    name: sdnc-apps-docker-arm64
-    project-name: 'sdnc-apps-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdnc-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
+#
+#- project:
+#    name: sdnc-apps-docker-arm64
+#    project-name: 'sdnc-apps-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'sdnc/apps'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdnc-apps-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
     name: sdnc-apps-clm
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
+
+- project:
+    name: sdnc-apps-info
+    project-name: sdnc-apps
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdnc/apps
+    branch: master
index dbbfb7c..285f0f0 100644 (file)
@@ -8,10 +8,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
+      - 'sdnc_netconf_tls_post_deploy':
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
     branch: 'master'
index 190e0c2..32ed192 100644 (file)
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/northbound'
@@ -13,6 +14,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
+
+- project:
+    name: sdnc-northbound-info
+    project-name: sdnc-northbound
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdnc/northbound
+    branch: master
index 5bc6631..f6eb04c 100644 (file)
@@ -6,6 +6,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'sdnc/oam'
     stream:
@@ -13,6 +14,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
-
-- project:
-    name: sdnc-oam-docker-arm64
-    project-name: 'sdnc-oam-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/oam'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdnc-oam-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
+#
+#- project:
+#    name: sdnc-oam-docker-arm64
+#    project-name: 'sdnc-oam-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'sdnc/oam'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdnc-oam-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
     name: sdnc-oam-clm
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
+
+- project:
+    name: sdnc-oam-info
+    project-name: sdnc-oam
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdnc/oam
+    branch: master
index b194d85..47a8e7f 100644 (file)
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'integration-testing':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
index faaeb60..f39545d 100644 (file)
@@ -10,8 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'so-libs-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
     project-name: 'so-libs'
     branch: 'master'
     mvn-settings: 'so-libs-settings'
+
+- project:
+    name: so-libs-info
+    project-name: so-libs
+    jobs:
+      - gerrit-info-yaml-verify
+    project: so/libs
+    branch: master
index 4d3e169..e69cb5b 100644 (file)
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'so-settings'
+
+- project:
+    name: so-info
+    project-name: so
+    jobs:
+      - gerrit-info-yaml-verify
+    project: so
+    branch: master
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 78%
rename from jjb/testsuite/testsuite-heatbridge-master.yaml
rename to jjb/testsuite/testsuite-heatbridge.yaml
index 16ee0d9..20ba913 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'testsuite-heatbridge-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'testsuite-heatbridge-settings'
+
+- project:
+    name: testsuite-heatbridge-info
+    project-name: testsuite-heatbridge
+    jobs:
+      - gerrit-info-yaml-verify
+    project: testsuite/heatbridge
+    branch: master
index 400170c..db8c90c 100644 (file)
@@ -2,16 +2,43 @@
 - project:
     name: testsuite-python-testing-utils
     project-name: 'testsuite-python-testing-utils'
-    subproject:
-      - python-testing-utils:
-          path: '.'
-          pattern: '**'
+    python-version: python2
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
     project: 'testsuite/python-testing-utils'
+    subproject:
+      - '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-master-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: testsuite/python-testing-utils
+    project-name: 'testsuite-python-testing-utils'
+    build-node: 'ubuntu1604-builder-4c-4g'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'testsuite-python-testing-utils-settings'
+
+- project:
+    name: testsuite-python-testing-utils-info
+    project-name: testsuite-python-testing-utils
+    jobs:
+      - gerrit-info-yaml-verify
+    project: testsuite/python-testing-utils
+    branch: master
index bc1aef2..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'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'testsuite-settings'
+
+- project:
+    name: testsuite-info
+    project-name: testsuite
+    jobs:
+      - gerrit-info-yaml-verify
+    project: testsuite
+    branch: master
index ee8effe..ce90c49 100644 (file)
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
       - 'casablanca':
           branch: 'casablanca'
     functionality:
index b97a552..e4b2850 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-server-settings'
+
+- project:
+    name: usecase-ui-server-info
+    project-name: usecase-ui-server
+    jobs:
+      - gerrit-info-yaml-verify
+    project: usecase-ui/server
+    branch: master
index 0de5195..c4084bb 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-settings'
+
+- project:
+    name: usecase-ui-info
+    project-name: usecase-ui
+    jobs:
+      - gerrit-info-yaml-verify
+    project: usecase-ui
+    branch: master
index f403792..2442077 100644 (file)
     build-node: centos7-redis-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+
+- project:
+    name: vfc-gvnfm-vnflcm-info
+    project-name: vfc-gvnfm-vnflcm
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/gvnfm/vnflcm
+    branch: master
index 502dc41..1264efd 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+
+- project:
+    name: vfc-gvnfm-vnfmgr-info
+    project-name: vfc-gvnfm-vnfmgr
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/gvnfm/vnfmgr
+    branch: master
index 8d444be..e9fa8fe 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
+
+- project:
+    name: vfc-gvnfm-vnfres-info
+    project-name: vfc-gvnfm-vnfres
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/gvnfm/vnfres
+    branch: master
index b88633e..81b4527 100644 (file)
     build-node: centos7-redis-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-catalog-settings'
+
+- project:
+    name: vfc-nfvo-catalog-info
+    project-name: vfc-nfvo-catalog
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/catalog
+    branch: master
index 9e8570d..86f9e5c 100644 (file)
             !include-raw-escape: 'build-nfvo-db-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
 
+
+- project:
+    name: vfc-nfvo-db-info
+    project-name: vfc-nfvo-db
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/db
+    branch: master
index 6b9abf7..e295551 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-ems-settings'
+
+- project:
+    name: vfc-nfvo-driver-ems-info
+    project-name: vfc-nfvo-driver-ems
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/driver/ems
+    branch: master
index 00fc285..10ea310 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-sfc-settings'
+
+- project:
+    name: vfc-nfvo-driver-sfc-info
+    project-name: vfc-nfvo-driver-sfc
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/driver/sfc
+    branch: master
index 8121f1b..46a0e3c 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+
+- project:
+    name: vfc-nfvo-driver-svnfm-huawei-info
+    project-name: vfc-nfvo-driver-svnfm-huawei
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/driver/vnfm/svnfm
+    branch: master
index a4e53e5..ac8c87e 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-info
+    project-name: vfc-nfvo-driver-vnfm-gvnfm
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/driver/vnfm/gvnfm
+    branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
deleted file mode 100644 (file)
index fcf552e..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- project:
-    name: vfc-nfvo-driver-vnfm-svnfm-nokia
-    project-name: 'vfc-nfvo-driver-svnfm-nokia'
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    subproject:
-      - 'drv-vnfm-nokia':
-          pom: 'nokia/vnfmdriver/pom.xml'
-          pattern: 'nokia/vnfmdriver/**'
-    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
-
-- project:
-    name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    mvn-params: '-f nokia/vnfmdriver/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
-    project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia'
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: vfc-nfvo-driver-vnfm-svnfm-nokia-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f nokia/pom.xml'
-    nexus-iq-namespace: 'onap-'
-    project: vfc/nfvo/driver/vnfm/svnfm
-    project-name: 'vfc-nfvo-driver-svnfm-nokia'
-    build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index a5cbe02..1dd3cff 100644 (file)
       - '{project-name}-{stream}-release-version-profile-java-daily'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: vfc-nfvo-driver-svnfm-root-info
+    project-name: vfc-nfvo-driver-svnfm-root
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/driver/vnfm/svnfm
+    branch: master
index f209bbf..2805ea9 100644 (file)
     build-node: centos7-redis-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
+
+- project:
+    name: vfc-nfvo-lcm-info
+    project-name: vfc-nfvo-lcm
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/lcm
+    branch: master
index b848b1f..935ffca 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-multivimproxy-settings'
+
+- project:
+    name: vfc-nfvo-multivimproxy-info
+    project-name: vfc-nfvo-multivimproxy
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/multivimproxy
+    branch: master
index 4d54d0e..7ebfd06 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-resmanagement-settings'
+
+- project:
+    name: vfc-nfvo-resmanagement-info
+    project-name: vfc-nfvo-resmanagement
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/resmanagement
+    branch: master
index 0e9bcf8..9664d08 100644 (file)
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-wfengine-settings'
+
+- project:
+    name: vfc-nfvo-wfengine-info
+    project-name: vfc-nfvo-wfengine
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vfc/nfvo/wfengine
+    branch: master
index 04d6536..23afa74 100644 (file)
@@ -8,23 +8,21 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     functionality:
       - 'healthCheck':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
 
-- project:
-    name: vid-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vid'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'healthCheck':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-    robot-options: ''
+#- project:
+#    name: vid-csit-arm64
+#    jobs:
+#      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+#      - '{project-name}-arm64-{stream}-csit-{functionality}'
+#    project-name: 'vid'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    functionality:
+#      - 'healthCheck':
+#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+#    robot-options: ''
index 54a680e..1380ed2 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          build-node: queue-docker-4c-4g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-{stream}-release-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     project: 'vid'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
 
-- project:
-    name: vid-docker-arm64
-    project-name: 'vid-arm64'
-    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: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: vid-docker-arm64
+#    project-name: 'vid-arm64'
+#    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: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: vid-sonar
     jobs:
@@ -70,6 +71,7 @@
     mvn-settings: 'vid-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-params: '-Dskip.npm'
 
 - project:
     name: vid-clm
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vid-settings'
+    mvn-params: '-Dskip.npm'
+
+- project:
+    name: vid-info
+    project-name: vid
+    jobs:
+      - gerrit-info-yaml-verify
+    project: vid
+    branch: master
diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml
new file mode 100644 (file)
index 0000000..33a21d6
--- /dev/null
@@ -0,0 +1,70 @@
+---
+- job-template:
+    # Job template for running a script to build an artifact and
+    # upload it to nexus as RAW artifacts.
+    #
+
+    name: '{project-name}-{stream}-build-and-upload'
+
+    pre_script: ''
+    post_script: ''
+    artifact_name: ''
+    project_id: ''
+
+    project-type: freestyle
+    concurrent: true
+    node: '{build-node}'
+
+    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:
+      - git:
+          credentials-id: '{jenkins-ssh-credential}'
+          url: '$GIT_BASE'
+          refspec: ''
+          choosing-strategy: 'default'
+          branches:
+            - 'refs/heads/{branch}'
+          skip-tag: true
+          wipe-workspace: true
+          submodule:
+            recursive: '{submodule-recursive}'
+            timeout: '24'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: 'H H * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+      - shell: '{obj:pre_script}'
+      - lf-infra-create-netrc:
+          server-id: ecomp-raw
+      - inject:
+          properties-content: |
+            ARTIFACT_NAME={artifact_name}
+            PROJECT_ID={project_id}
+      - shell: '{obj:post_script}'
+      - lf-provide-maven-settings-cleanup
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
\ No newline at end of file
diff --git a/jjb/vnfrqts/post-upload-artifact.sh b/jjb/vnfrqts/post-upload-artifact.sh
new file mode 100644 (file)
index 0000000..588e49b
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e -o pipefail
+set -- $ARTIFACT_NAME
+if [ -z "$ARTIFACT_NAME" ]
+then
+    echo "ERROR NO ARTIFACTS ENTERED"
+else
+    if [ -z "$2" ]
+    then
+        cd $WORKSPACE/docs/data
+        echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
+        curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
+    else
+        cd $WORKSPACE/ice_validator/output
+        echo "-n --upload-file $1 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1"
+        curl -n --upload-file "$1" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1"
+        echo "-n --upload-file $2 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2"
+        curl -n --upload-file "$2" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2"
+    fi
+fi
\ No newline at end of file
diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh
new file mode 100644 (file)
index 0000000..da1d5e2
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+virtualenv $WORKSPACE/venv-tox
+source $WORKSPACE/venv-tox/bin/activate
+pip install --upgrade pip
+pip install -r etc/requirements.txt
+ls
+tox -e needs
\ No newline at end of file
index e62095f..7bb260e 100644 (file)
@@ -7,3 +7,19 @@
     project-name: 'vnfrqts-requirements'
     branch: 'master'
     mvn-settings: 'vnfrqts-requirements-settings'
+
+- project:
+    name: vnfrqts-requirements-upload-json
+    project: 'vnfrqts/requirements'
+    project-name: 'vnfrqts-requirements'
+    mvn-settings: 'vnfrqts-requirements-settings'
+    mvn-global-settings: 'global-settings'
+    stream:
+      - 'master':
+          branch: 'master'
+    jobs:
+      - '{project-name}-{stream}-build-and-upload':
+          pre_script: !include-raw-escape: pre-build-needs.sh
+          artifact_name: needs.json
+          project_id: org.onap.vnfrqts.requirements
+          post_script: !include-raw-escape: post-upload-artifact.sh
index 9f6a406..499bfae 100644 (file)
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
-- project:
-    name: vnfsdk-dovetail-integration-arm64
-    project-name: 'vnfsdk-dovetail-integration-arm64'
-    project: 'vnfsdk/dovetail-integration'
-    pom: 'pom.xml'
-    python-version: python2.7
-    tox-dir: '.'
-    tox-envs: ''
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-dovetail-integration-settings'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    jobs:
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-
+#- project:
+#    name: vnfsdk-dovetail-integration-arm64
+#    project-name: 'vnfsdk-dovetail-integration-arm64'
+#    project: 'vnfsdk/dovetail-integration'
+#    pom: 'pom.xml'
+#    python-version: python2.7
+#    tox-dir: '.'
+#    tox-envs: ''
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'vnfsdk-dovetail-integration-settings'
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    jobs:
+#      - '{project-name}-{stream}-docker-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#
 - project:
     name: vnfsdk-dovetail-integration-tox-sonar
     jobs:
diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
deleted file mode 100644 (file)
index a845ee1..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
----
-- project:
-    name: vnfsdk-ice
-    project-name: 'vnfsdk-ice'
-    project: 'vnfsdk/ice'
-    pom: 'pom.xml'
-    python-version: python3
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - 'scripts':
-          path: 'validation-scripts'
-          pattern: 'validation-scripts/**'
-          pom: 'validation-scripts/pom.xml'
-          tox-dir: 'validation-scripts/'
-          tox-envs: ''
-      - 'server':
-          path: 'ice-server'
-          pattern: 'ice-server/**'
-          pom: 'ice-server/pom.xml'
-          tox-dir: 'ice-server/'
-          tox-envs: ''
-    mvn-settings: 'vnfsdk-ice-settings'
-    build-node: ubuntu1604-builder-4c-4g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-
-- project:
-    name: vnfsdk-ice-docker
-    project-name: 'vnfsdk-ice-docker'
-    project: 'vnfsdk/ice'
-    pom: 'pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - 'docker':
-          path: 'docker'
-          pattern: 'docker/**'
-          pom: 'docker/pom.xml'
-    mvn-settings: 'vnfsdk-ice-settings'
-    build-node: ubuntu1604-builder-4c-4g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'docker/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
-    name: vnfsdk-ice-docker-arm64
-    project-name: 'vnfsdk-ice-docker-arm64'
-    project: 'vnfsdk/ice'
-    pom: 'pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - 'docker':
-          path: 'docker'
-          pattern: 'docker/**'
-          pom: 'docker/pom.xml'
-    mvn-settings: 'vnfsdk-ice-settings'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'docker/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-
-- project:
-    name: vnfsdk-ice-validation-scripts-tox-sonar
-    jobs:
-      - gerrit-tox-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'vnfsdk/ice'
-    project-name: 'vnfsdk-ice'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-ice-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-- project:
-    name: vnfsdk-ice-info
-    jobs:
-      - gerrit-info-yaml-verify
-    project: 'vnfsdk/ice'
-    project-name: 'vnfsdk-ice'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-ice-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: vnfsdk-ice-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: vnfsdk/ice
-    project-name: 'vnfsdk-ice'
-    build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vnfsdk-ice-settings'
index c1d2c6c..0724f66 100644 (file)
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vnfsdk-refrepo-arm64
-    project-name: 'vnfsdk-refrepo-arm64'
-    jobs:
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
-          mvn-goals: 'docker:build'
-          docker-image-name: 'onap/vnfsdk/refrepo'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'vnfsdk/refrepo'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-refrepo-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: vnfsdk-refrepo-arm64
+#    project-name: 'vnfsdk-refrepo-arm64'
+#    jobs:
+#      - '{project-name}-{stream}-aai-docker-java-daily':
+#          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
+#          mvn-goals: 'docker:build'
+#          docker-image-name: 'onap/vnfsdk/refrepo'
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'vnfsdk/refrepo'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'vnfsdk-refrepo-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: vnfsdk-refrepo-sonar
     jobs:
diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh
new file mode 100644 (file)
index 0000000..b90f77b
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+virtualenv -p python3 $WORKSPACE/venv-tox
+source $WORKSPACE/venv-tox/bin/activate
+pip3 install --upgrade pip
+pip3 install --no-use-pep517 -r requirements.txt
+ls
+wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json"
+echo "Copied newest needs."
+cd ice_validator/
+pytest --self-test tests/
\ No newline at end of file
diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
deleted file mode 100644 (file)
index 24444c8..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: vvp-project-view
-    project-name: vvp
-    views:
-      - project-view
-
-- project:
-    name: vvp-cms
-    project-name: 'vvp-cms'
-    project: 'vvp/cms'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-cms-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
-
-- project:
-    name: vvp-cms-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/cms'
-    project-name: 'vvp-cms'
-    branch: 'master'
-    mvn-settings: 'vvp-cms-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-devkit.yaml b/jjb/vvp/vvp-devkit.yaml
deleted file mode 100644 (file)
index 5646b02..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
----
-
-- project:
-    name: vvp-devkit
-    project-name: 'vvp-devkit'
-    project: 'vvp/devkit'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-devkit-settings'
-    build-node: ubuntu1604-builder-4c-4g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
index ca14d16..338c79b 100644 (file)
@@ -3,11 +3,7 @@
     name: vvp-documentation
     project-name: 'vvp-documentation'
     project: 'vvp/documentation'
-    rtdproject: 'onap'
-    stream:
-      - 'master':
-          branch: 'master'
     mvn-settings: 'vvp-documentation-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    branch: master
     jobs:
-      - gerrit-tox-verify
+      - gerrit-info-yaml-verify
diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
deleted file mode 100644 (file)
index 1919090..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
----
-
-- project:
-    name: vvp-engagementmgr
-    project-name: 'vvp-engagementmgr'
-    project: 'vvp/engagementmgr'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-engagementmgr-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
-
-- project:
-    name: vvp-engagementmgr-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/engagementmgr'
-    project-name: 'vvp-engagementmgr'
-    branch: 'master'
-    mvn-settings: 'vvp-engagementmgr-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
deleted file mode 100644 (file)
index 47c553e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
-    name: vvp-gitlab
-    project-name: 'vvp-gitlab'
-    project: 'vvp/gitlab'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-gitlab-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
deleted file mode 100644 (file)
index bdb7bda..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
----
-
-- project:
-    name: vvp-image-scanner
-    project-name: 'vvp-image-scanner'
-    project: 'vvp/image-scanner'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-image-scanner-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
-
-- project:
-    name: vvp-image-scanner-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'vvp/image-scanner'
-    project-name: 'vvp-image-scanner'
-    branch: 'master'
-    mvn-settings: 'vvp-image-scanner-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
deleted file mode 100644 (file)
index 8d46eba..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
-    name: vvp-jenkins
-    project-name: 'vvp-jenkins'
-    project: 'vvp/jenkins'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-jenkins-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
deleted file mode 100644 (file)
index 6a50154..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
-    name: vvp-portal
-    project-name: 'vvp-portal'
-    project: 'vvp/portal'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-portal-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
deleted file mode 100644 (file)
index 22b60ef..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
-    name: vvp-postgresql
-    project-name: 'vvp-postgresql'
-    project: 'vvp/postgresql'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-postgresql-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
deleted file mode 100644 (file)
index 8dd6cd9..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- project:
-    name: vvp-test-engine
-    project-name: 'vvp-engine'
-    project: 'vvp/test-engine'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    mvn-settings: 'vvp-test-engine-settings'
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    docker-pom: 'pom.xml'
-    mvn-profile: 'default'
index 94861bd..943ea87 100644 (file)
     mvn-settings: 'vvp-validation-scripts-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vvp-validation-scripts-tracability-matrix
+    project: 'vvp/validation-scripts'
+    project-name: 'vvp-validation-scripts'
+    mvn-settings: 'vvp-validation-scripts-settings'
+    mvn-global-settings: 'global-settings'
+    stream:
+      - 'master':
+          branch: 'master'
+    jobs:
+      - '{project-name}-{stream}-build-and-upload':
+          pre_script: !include-raw-escape: pre-build-csv.sh
+          artifact_name: traceability.csv rst.csv
+          project_id: org.onap.vvp.validation-scripts
+          post_script: !include-raw-escape: ../vnfrqts/post-upload-artifact.sh
diff --git a/jjb/wss-unified-agent.config b/jjb/wss-unified-agent.config
new file mode 100644 (file)
index 0000000..4a9f091
--- /dev/null
@@ -0,0 +1,236 @@
+####################################################################\r
+# WhiteSource Unified-Agent configuration file\r
+####################################################################\r
+##########################################\r
+# GENERAL SCAN MODE: Files and Package Managers\r
+##########################################\r
+\r
+checkPolicies=false\r
+forceCheckAllDependencies=false\r
+forceUpdate=false\r
+forceUpdate.failBuildOnPolicyViolation=false\r
+offline=false\r
+#ignoreSourceFiles=true\r
+#scanComment=\r
+#updateInventory=false\r
+#resolveAllDependencies=false\r
+#failErrorLevel=ALL\r
+#requireKnownSha1=false\r
+#generateProjectDetailsJson=true\r
+#generateScanReport=true\r
+#scanReportTimeoutMinutes=10\r
+#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model\r
+\r
+#projectPerFolder=true\r
+#projectPerFolderIncludes=\r
+#projectPerFolderExcludes=\r
+\r
+#wss.connectionTimeoutMinutes=60\r
+# Change the below URL to your WhiteSource server.\r
+# Use the 'WhiteSource Server URL' which can be retrieved\r
+# from your 'Profile' page on the 'Server URLs' panel.\r
+# Then, add the '/agent' path to it.\r
+wss.url=https://saas.whitesourcesoftware.com/agent\r
+\r
+#npm.resolveDependencies=false\r
+#npm.ignoreSourceFiles=false\r
+#npm.includeDevDependencies=true\r
+#npm.runPreStep=true\r
+#npm.ignoreNpmLsErrors=true\r
+#npm.ignoreScripts=true\r
+#npm.yarnProject=true\r
+#npm.accessToken=\r
+#npm.identifyByNameAndVersion=true\r
+\r
+#bower.resolveDependencies=false\r
+#bower.ignoreSourceFiles=true\r
+#bower.runPreStep=true\r
+\r
+#nuget.resolvePackagesConfigFiles=false\r
+#nuget.resolveCsProjFiles=false\r
+#nuget.resolveDependencies=false\r
+#nuget.restoreDependencies=true\r
+#nuget.preferredEnvironment=\r
+#nuget.packagesDirectory=\r
+#nuget.ignoreSourceFiles=true\r
+#nuget.runPreStep=true\r
+#nuget.resolveNuspecFiles=false\r
+\r
+#python.resolveDependencies=false\r
+#python.ignoreSourceFiles=false\r
+#python.ignorePipInstallErrors=true\r
+#python.installVirtualenv=true\r
+#python.resolveHierarchyTree=false\r
+#python.requirementsFileIncludes=requirements.txt\r
+#python.resolveSetupPyFiles=true\r
+#python.runPipenvPreStep=true\r
+#python.pipenvDevDependencies=true\r
+#python.IgnorePipenvInstallErrors=true\r
+\r
+#maven.ignoredScopes=test provided\r
+#maven.resolveDependencies=false\r
+#maven.ignoreSourceFiles=true\r
+#maven.aggregateModules=true\r
+#maven.ignorePomModules=false\r
+#maven.runPreStep=true\r
+#maven.ignoreMvnTreeErrors=true\r
+#maven.environmentPath=\r
+#maven.m2RepositoryPath=\r
+\r
+#gradle.ignoredScopes=\r
+#gradle.resolveDependencies=false\r
+#gradle.runAssembleCommand=false\r
+#gradle.runPreStep=true\r
+#gradle.ignoreSourceFiles=true\r
+#gradle.aggregateModules=true\r
+#gradle.preferredEnvironment=wrapper\r
+#gradle.localRepositoryPath=\r
+\r
+#paket.resolveDependencies=false\r
+#paket.ignoredGroups=\r
+#paket.ignoreSourceFiles=false\r
+#paket.runPreStep=true\r
+#paket.exePath=\r
+\r
+#go.resolveDependencies=false\r
+#go.collectDependenciesAtRuntime=true\r
+#go.dependencyManager=\r
+#go.ignoreSourceFiles=true\r
+#go.glide.ignoreTestPackages=false\r
+#go.gogradle.enableTaskAlias=true\r
+\r
+#ruby.resolveDependencies = false\r
+#ruby.ignoreSourceFiles = false\r
+#ruby.installMissingGems = true\r
+#ruby.runBundleInstall = true\r
+#ruby.overwriteGemFile = true\r
+\r
+#sbt.resolveDependencies=false\r
+#sbt.ignoreSourceFiles=true\r
+#sbt.aggregateModules=true\r
+#sbt.runPreStep=true\r
+#sbt.targetFolder=\r
+\r
+#php.resolveDependencies=false\r
+#php.runPreStep=true\r
+#php.includeDevDependencies=true\r
+\r
+#html.resolveDependencies=false\r
+\r
+#cocoapods.resolveDependencies=false\r
+#cocoapods.runPreStep=true\r
+#cocoapods.ignoreSourceFiles=false\r
+\r
+#hex.resolveDependencies=false\r
+#hex.runPreStep=true\r
+#hex.ignoreSourceFiles=false\r
+#hex.aggregateModules=true\r
+\r
+##################################\r
+# Organization tokens:\r
+##################################\r
+apiKey=\r
+\r
+#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option\r
+#userKey=\r
+\r
+projectName=\r
+projectVersion=\r
+projectToken=\r
+\r
+productName=\r
+productVersion=\r
+productToken=\r
+#updateType=APPEND\r
+#requesterEmail=user@provider.com\r
+\r
+#########################################################################################\r
+# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE\r
+#########################################################################################\r
+includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx **/*.go **/*.py\r
+\r
+#includes=**/*.m **/*.mm  **/*.js **/*.php\r
+#includes=**/*.jar\r
+#includes=**/*.gem **/*.rb\r
+#includes=**/*.dll **/*.cs **/*.nupkg\r
+#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2\r
+#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py\r
+\r
+## Exclude file extensions or specific directories by adding **/*.<extension> or **<excluded_dir>/**\r
+excludes=**/*sources.jar **/*javadoc.jar\r
+\r
+case.sensitive.glob=false\r
+followSymbolicLinks=true\r
+\r
+##################################\r
+# Archive properties\r
+##################################\r
+#archiveExtractionDepth=2\r
+#archiveIncludes=**/*.war **/*.ear\r
+#archiveExcludes=**/*sources.jar\r
+\r
+##################################\r
+# Proxy settings\r
+##################################\r
+#proxy.host=\r
+#proxy.port=\r
+#proxy.user=\r
+#proxy.pass=\r
+\r
+##################################\r
+# SCM settings\r
+##################################\r
+#scm.type=\r
+#scm.user=\r
+#scm.pass=\r
+#scm.ppk=\r
+#scm.url=\r
+#scm.branch=\r
+#scm.tag=\r
+#scm.npmInstall=\r
+#scm.npmInstallTimeoutMinutes=\r
+#scm.repositoriesFile=\r
+\r
+##############################################\r
+# SCAN MODE: Linux package manager settings\r
+##############################################\r
+#scanPackageManager=true\r
+\r
+##################################\r
+# SCAN MODE: Docker images\r
+##################################\r
+#docker.scanImages=true\r
+#docker.includes=.*.*\r
+#docker.excludes=\r
+#docker.pull.enable=true\r
+#docker.pull.images=.*.*\r
+#docker.pull.maxImages=10\r
+#docker.pull.tags=.*.*\r
+#docker.pull.digest=\r
+#docker.delete.force=true\r
+#docker.login.sudo=false\r
+\r
+#docker.aws.enable=true\r
+#docker.aws.registryIds=\r
+\r
+#docker.azure.enable=true\r
+#docker.azure.userName=\r
+#docker.azure.userPassword=\r
+#docker.azure.registryNames=\r
+\r
+##################################\r
+# SCAN MODE: Docker containers\r
+##################################\r
+#docker.scanContainers=true\r
+#docker.containerIncludes=.*.*\r
+#docker.containerExcludes=\r
+\r
+################################\r
+# Serverless settings\r
+################################\r
+#serverless.provider=\r
+#serverless.scanFunctions=true\r
+#serverless.includes=\r
+#serverless.excludes=\r
+#serverless.region=\r
+#serverless.maxFunctions=10\r
diff --git a/packer/provision/basebuild/.dummy b/packer/provision/basebuild/.dummy
deleted file mode 100644 (file)
index e69de29..0000000
index bc7c19b..f3af621 100644 (file)
@@ -9,10 +9,21 @@
     docker_compose_version: 1.17.1
     glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c
     glide_version: v0.13.1
-    golang_checksum: sha256:07d81c6b6b4c2dcf1b5ef7c27aaebd3691cdb40548500941f92b221147c5d9c7
     golang_version: 1.9.1
 
   tasks:
+    - name: "Checking for x86_64"
+      set_fact:
+        host_arch: "amd64"
+        golang_checksum: sha256:07d81c6b6b4c2dcf1b5ef7c27aaebd3691cdb40548500941f92b221147c5d9c7
+      when: "'x86_64' in ansible_architecture"
+
+    - name: "Checking for aarch64"
+      set_fact:
+        host_arch: "arm64"
+        golang_checksum: sha256:d31ecae36efea5197af271ccce86ccc2baf10d2e04f20d0fb75556ecf0614dad
+      when: "'aarch64' in ansible_architecture"
+
     - name: 'Install Docker Compose {{docker_compose_version}}'
       command: curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/{{docker_compose_version}}/docker-compose-Linux-x86_64"
       become: true
 
     - name: 'Install GoLang {{golang_version}}'
       block:
-        - name: 'Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-amd64.tar.gz'
+        - name: 'Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
           get_url:
-            url: 'https://storage.googleapis.com/golang/go{{golang_version}}.linux-amd64.tar.gz'
-            dest: '/tmp/go{{golang_version}}.linux-amd64.tar.gz'
+            url: 'https://storage.googleapis.com/golang/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
+            dest: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
             checksum: '{{golang_checksum}}'
         - name: 'Install golang {{golang_version}} to /usr/local'
           unarchive:
-            src: '/tmp/go{{golang_version}}.linux-amd64.tar.gz'
+            src: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
             dest: /usr/local
             remote_src: true
           become: true
         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:
@@ -74,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
       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'
diff --git a/shell/apply-submodule-patch-oom.sh b/shell/apply-submodule-patch-oom.sh
new file mode 100644 (file)
index 0000000..ad818fb
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+# Update kubernetes submodule under oom with patch to be verified
+
+echo '--> apply-submodule-patch-oom.sh'
+cd kubernetes/${HELM_MODULE}
+remote_path=`git remote -v | grep fetch | awk '{print $2}'`
+git fetch ${remote_path} $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD
+cd ../..