Merge "Change to frankfurt branch for verify jobs"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Wed, 27 May 2020 17:10:14 +0000 (17:10 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 27 May 2020 17:10:14 +0000 (17:10 +0000)
173 files changed:
global-jjb
jenkins-config/clouds/openstack/cattle/cloud.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
jenkins-config/global-vars-production.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-sms.yaml
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-cacher.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-graphadmin.yaml
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-router-core-service.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-search-data-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-traversal.yaml
jjb/aai/aai-validation.yaml
jjb/appc/appc-cdt.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/appc/appc-parent.yaml
jjb/ccsdk/features.yaml
jjb/ci-management/ci-management-coverity.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/ci-management/ci-management-views.yaml
jjb/ci-management/ci-management.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
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.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-java.yaml
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dcaegen2/dcaegen2-services-son-handler.yaml
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/demo/demo.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-kafka-docker.yaml
jjb/dmaap/dmaap-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/externalapi/externalapi-nbi.yaml
jjb/global-templates-c.yaml
jjb/global-templates-golang.yaml
jjb/global-templates-java.yaml
jjb/global-templates-python.yaml
jjb/global-templates-script.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/include-raw-deploy-archives.sh [deleted file]
jjb/include-update-pom-versions-not-parent.sh [deleted file]
jjb/include-update-pom-versions.sh [deleted file]
jjb/integration/docker/info-integration-docker.yaml [deleted file]
jjb/integration/docker/integration-docker-onap-java11.yaml [new file with mode: 0644]
jjb/integration/docker/integration-docker-onap-python.yaml [new file with mode: 0644]
jjb/integration/integration-docker-compose.yaml [new file with mode: 0644]
jjb/integration/integration-docker.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates-docker.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration.yaml
jjb/integration/netconf-pnp-simulator-verify.sh [new file with mode: 0644]
jjb/integration/simulators/integration-dc-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-pnf-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-ran-simulator.yaml
jjb/integration/usecases/integration-usecases-bbs.yaml
jjb/integration/usecases/integration-usecases-mdons.yaml [new file with mode: 0644]
jjb/integration/xtesting/info-integration-xtesting.yaml [deleted file]
jjb/integration/xtesting/integration-xtesting.yaml [new file with mode: 0644]
jjb/lf-infra-releasedockerhub.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/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/multicloud-k8s.yaml
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-jar.yaml
jjb/music/music-mdbc.yaml
jjb/music/music-prom.yaml
jjb/music/music.yaml
jjb/oom/offline-installer.yaml
jjb/oom/oom-helm.yaml
jjb/oom/oom-oneclick-config.yaml
jjb/oom/oom-readiness.yaml [new file with mode: 0644]
jjb/oom/oom-registrator.yaml
jjb/oom/oom-templates.yaml [new file with mode: 0644]
jjb/oparent/oparent.yaml
jjb/openci/openci-onap-daily-jobs.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-engine.yaml
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-xacml-pdp.yaml
jjb/portal-sdk/portal-sdk.yaml
jjb/portal/portal-docker.yaml
jjb/portal/portal.yaml
jjb/sdc/sdc.yaml
jjb/so/so-libs.yaml
jjb/so/so.yaml
jjb/testsuite/testsuite-heatbridge.yaml
jjb/testsuite/testsuite.yaml
jjb/usecases/5G-bulkpm.yaml [deleted file]
jjb/usecases/usecases-csit.yaml
jjb/vfc/vfc-nfvo-catalog-csit.yaml [deleted file]
jjb/vid/vid-csit.yaml
jjb/vid/vid.yaml
jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
jjb/vnfsdk/vnfsdk-functest.yaml
jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vnfsdk/vnfsdk-ves-agent.yaml
jjb/vvp/pre-build-csv.sh
jjb/vvp/vvp-validation-scripts.yaml
packer/provision/helm.yaml
shell/docker-compose-logs.sh [new file with mode: 0644]

index 2100921..0c2d2ee 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 21009213aa6204bfb40eedc1b11f89a259abd917
+Subproject commit 0c2d2eea337b2700a7913d03aa5afd75d0c11b93
index 7872de3..2b0ca12 100644 (file)
@@ -1,6 +1,6 @@
 # Cloud Configuration
 CLOUD_CREDENTIAL_ID=vexx-ecompci
-CLOUD_URL=https://auth.vexxhost.net/v3/
+CLOUD_URL=https://auth.vexxhost.net/v3
 CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
deleted file mode 100644 (file)
index ec5ae3e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
deleted file mode 100644 (file)
index 65e930c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
deleted file mode 100644 (file)
index 56786f7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20191127-235551.406
-LABELS=ubuntu1604-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
index e147067..d69e209 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20200311-205153.422
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20200506-233718.921
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2
index d450c7b..3c83f0a 100644 (file)
@@ -15,6 +15,7 @@ NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
+S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-release-2018
 SILO=production
index 412f808..75ce593 100644 (file)
@@ -15,6 +15,7 @@ NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
+S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-test
 SILO=sandbox
index 341547a..5e4dab4 100644 (file)
@@ -34,6 +34,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aaf-authz-settings'
     files: '**'
     archive-artifacts: ''
index 88932f1..62ed2fd 100644 (file)
@@ -7,6 +7,8 @@
     path: 'sms-service/src'
     golangver: 'golang111'
     jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
       - gerrit-maven-stage:
index 448dfa3..4a68af1 100644 (file)
@@ -22,8 +22,9 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
+          mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
index bdae075..13799a5 100644 (file)
@@ -24,8 +24,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
index 30b06d5..ec4b2bd 100644 (file)
@@ -20,8 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
     files: '**'
index 2c34a43..823dab7 100644 (file)
@@ -24,8 +24,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/data-router'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-data-router-settings'
index 7d18a86..ae853d5 100644 (file)
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-gui-settings'
     files: '**'
     archive-artifacts: ''
@@ -43,8 +43,8 @@
     project: 'aai/esr-gui'
     project-name: 'aai-esr-gui'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-gui-settings'
 
 - project:
index f66b464..1c8b961 100644 (file)
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-server-settings'
     files: '**'
     archive-artifacts: ''
@@ -61,8 +61,8 @@
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-server-settings'
 
 - project:
index c08d6af..08ccd0e 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/event-client'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-event-client-settings'
index 139cfd8..1278ed6 100644 (file)
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
index 693cc69..c1cdbe4 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/logging-service'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
index 829909b..84e2a3e 100644 (file)
           build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
-          mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
@@ -48,7 +47,6 @@
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     branch: 'master'
-    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -63,7 +61,6 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-model-loader-settings'
 
 - project:
@@ -73,7 +70,6 @@
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: aai/model-loader
-    mvn-params: '-P spring-boot-2-1'
     branch: master
 
 - project:
@@ -83,7 +79,6 @@
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-model-loader-settings'
-    mvn-params: '-P spring-boot-2-1'
     wss-product-name: 'aai'
     mvn-clean-install: true
     project: 'aai/model-loader'
index e930f11..fee95b4 100644 (file)
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
index 8bd004f..c641d98 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
index f74baf2..316c5dd 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/router-core'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-router-core-settings'
index b7a3e3d..24c640e 100644 (file)
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn35'
     files: '**'
index fbcb6be..1d68ea5 100644 (file)
@@ -25,8 +25,8 @@
     project: 'aai/search-data-service'
     docker-image-name: 'onap/search-data-service'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
index 60bbef5..49c9941 100644 (file)
@@ -24,8 +24,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
index 3d2b427..4ac85e0 100644 (file)
@@ -13,8 +13,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-fe'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-fe-settings'
index d2922c3..b6178bb 100644 (file)
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
index 45f764a..2fab17b 100644 (file)
@@ -24,8 +24,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/validation'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-validation-settings'
index 8a3f8e8..26764c6 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''
index 4fdbb66..edffd6b 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'
@@ -39,6 +41,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'
index 37e2272..513126b 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-settings'
     maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: appc-sonar
@@ -42,7 +44,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
index 2ada1b0..c717284 100644 (file)
@@ -22,6 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-parent-settings'
     maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
index b4a116a..17dd0b4 100644 (file)
@@ -49,7 +49,7 @@
     branch: 'master'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     maven-version: "mvn35"
 
 - project:
@@ -65,6 +65,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
@@ -86,5 +87,6 @@
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     project: ccsdk/features
     branch: master
index 6003bf2..c9a8f5e 100644 (file)
@@ -20,6 +20,7 @@
           View Defects</a>.</li>
       </ol>
       <p>Please note that processing data takes some time. You will get an email when it's done.</p>
+      <p>See more <a href="https://wiki.onap.org/x/Y6vQAw">Coverity Scan HOWTOs</a> on ONAP Developer Wiki.</p>
       <hr/>
 
     project-type: freestyle
index f8014bf..79b4853 100644 (file)
@@ -14,7 +14,6 @@
 
     platforms:
       - centos-7
-      - ubuntu-16.04
       - ubuntu-18.04
     templates: builder
 
@@ -33,7 +32,6 @@
 
     platforms:
       - centos-7
-      - ubuntu-16.04
       - ubuntu-18.04-arm64
       - ubuntu-18.04
     templates: docker
index 43d5f09..dfab260 100644 (file)
       - common-view
     view-name: All-Coverity
     view-regex: '.*-coverity'
-    view-description: 'List of Coverity jobs'
+    view-description: >
+      <h1>List of Coverity Scan static code analysis jobs</h1>
+      <p>See <a href="https://wiki.onap.org/x/Y6vQAw">how to add your component to Coverity Scan</a>
+      on ONAP Developer Wiki.</p>
 
 - view:
     name: CLM
index b31cffa..8b4d6e5 100644 (file)
@@ -18,6 +18,9 @@
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
     jjb-version: 2.9.1
+    # configure the gerrit-jjb-verify job
+    build-node-label-check: true
+    build-node-label-list: ""
 
 - project:
     name: builder-openstack
index b148414..67b3f67 100644 (file)
@@ -31,6 +31,8 @@
     stream:
         - 'master':
               branch: 'master'
+        - 'frankfurt':
+              branch: 'frankfurt'
         - 'elalto':
               branch: 'elalto'
     mvn-settings: 'clamp-settings'
index ef105ff..4d1f3de 100644 (file)
@@ -28,7 +28,7 @@
           pom: 'deployment/docker/pom.xml'
           mvn-goals: 'docker:build'
           docker-image-name: 'onap/cli'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'cli'
     stream:
       - 'master':
@@ -36,7 +36,7 @@
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: cli-arm64
@@ -66,7 +66,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
@@ -83,7 +83,7 @@
     project-name: 'cli'
     branch: 'master'
     mvn-settings: 'cli-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: cli-info
index fa3ad68..4e65ab9 100644 (file)
@@ -29,7 +29,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/analytics/pnda'
     project-name: 'dcaegen2-analytics-pnda'
     branch: 'master'
@@ -43,7 +43,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/analytics/pnda
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project-name: 'dcaegen2-analytics-pnda'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-pnda-settings'
index 4c626e9..0737cbd 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca-gen2'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
index 2e2296c..e0e4c05 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
@@ -14,7 +16,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     jobs:
       - '{project-name}-{stream}-verify-java':
@@ -38,7 +40,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/analytics/tca'
     project-name: 'dcaegen2-analytics-tca'
     branch: 'master'
@@ -54,7 +56,7 @@
     project: 'dcaegen2/analytics/tca'
     project-name: 'dcaegen2-analytics-tca'
     branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-settings: 'dcaegen2-analytics-tca-settings'
 
 - project:
index 3231fae..3f4f911 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
index d6f7b87..3ab5a74 100644 (file)
@@ -7,6 +7,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'frankfurt':
+          branch: 'frankfurt'
+          java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
index e06ca9e..7c72a16 100644 (file)
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index a586372..c2d604a 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index eba5e39..8896237 100644 (file)
@@ -22,6 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index e1eda94..c5b80e4 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 8ea96a6..7d57150 100644 (file)
@@ -12,6 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     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
index 2203fe7..61c27fc 100644 (file)
@@ -28,6 +28,8 @@
     stream:
       - master:
           branch: master
+      - frankfurt:
+          branch: frankfurt
 
 - project:
     name: dcaegen2-platform-configbinding-sonar
index fdc6fa4..0aaf8c9 100644 (file)
@@ -12,6 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 44c5bf7..1268c50 100644 (file)
@@ -98,6 +98,8 @@
     stream:
       - master:
           branch: master
+      - frankfurt:
+          branch: frankfurt
     views:
       - project-view:
           project-name: dcaegen2-platform-adapter
index f368dae..3813968 100644 (file)
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index dc48e74..de506f8 100644 (file)
@@ -22,6 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-platform-settings'
     maven-deploy-properties: |
       deployAtEnd=true
index e84e83e..5a8a623 100644 (file)
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
index dea3938..73ffe09 100644 (file)
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
index 3e5a85c..abea091 100644 (file)
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
index 31d7d11..af7d874 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     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
index 9ff0471..07722a5 100644 (file)
@@ -12,6 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index a456b4f..4f5f997 100644 (file)
@@ -21,7 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-
+      - 'frankfurt':
+          branch: 'frankfurt'
     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
index eec174a..776eea2 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dcaegen2-services-bbs-event-processor
+    name: dcaegen2-services-bbs-event-processor-verify
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services'
     jobs:
@@ -15,6 +15,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'frankfurt':
+          branch: 'frankfurt'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-version: 'mvn35'
     maven-deploy-properties: |
@@ -39,7 +42,7 @@
           pattern: 'components/bbs-event-processor/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
+          mvn-goals: 'clean package -Dmaven.deploy.skip=true dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           pattern: 'components/bbs-event-processor/**'
@@ -66,7 +69,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-bbs-event-processor'
     branch: 'master'
index 017eb64..468b07a 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -42,6 +44,8 @@
     stream:
       - 'master':
          branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -71,6 +75,8 @@
     stream:
       - 'master':
          branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
index 1c2dd59..3c2c28c 100644 (file)
@@ -91,6 +91,8 @@
     stream:
       - master:
           branch: master
+      - frankfurt:
+          branch: frankfurt
     views:
       - project-view:
           project-name: dcaegen2-services-pmsh
index 7a23af1..47fa28b 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 6e0fe73..6690f20 100644 (file)
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
index f486b95..2791c37 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
index c2672c1..051c958 100644 (file)
@@ -21,6 +21,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'frankfurt':
+          branch: 'frankfurt'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
index 377a276..d8500b8 100644 (file)
@@ -17,6 +17,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
+      - 'frankfurt':
+          branch: 'frankfurt'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
index a969c81..d536d1a 100644 (file)
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
index 2603a69..f0f2c74 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-utils-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 1305937..318949a 100644 (file)
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'dcaegen2-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
index 305ca37..ea7bcaf 100644 (file)
@@ -38,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'demo'
     project-name: 'demo'
     branch: 'master'
@@ -61,7 +61,7 @@
     project-name: 'demo'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'
index d24124f..b20bbc5 100644 (file)
@@ -12,7 +12,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package -P docker docker:build docker:push'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
index 18cb107..ffd5a2d 100644 (file)
@@ -1,26 +1,47 @@
 - project:
-    name: dmaap-datarouter
+    name: dmaap-datarouter-java11
     project-name: 'dmaap-datarouter'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package -P docker docker:build docker:push'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
     project: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
+    files: '**'
+    archive-artifacts: ''
+    java-version: openjdk11
+
+
+- project:
+    name: dmaap-datarouter-java8
+    project-name: 'dmaap-datarouter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package -P docker docker:build docker:push'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+    project: 'dmaap/datarouter'
+    stream:
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk8
 
 - project:
     name: dmaap-datarouter-sonar
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/datarouter'
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-clm
@@ -49,6 +71,7 @@
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-info
index 5793822..38f4a5f 100644 (file)
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/dbcapi'
     project-name: 'dmaap-dbcapi'
     branch: 'master'
index b09e30e..1b3bfa6 100644 (file)
@@ -5,7 +5,7 @@
     project-name: 'dmaap-kafka-docker'
     jobs:
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -21,7 +21,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dmaap-kafka-docker-info
index f3b4fb8..350eb03 100644 (file)
@@ -21,7 +21,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/kafka11aaf'
     project-name: 'dmaap-kafka'
     branch: 'master'
index d92e85a..6549204 100644 (file)
@@ -29,7 +29,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/dmaapclient'
     project-name: 'dmaap-messagerouter-dmaapclient'
     branch: 'master'
index 21a8ba5..82c12d3 100644 (file)
@@ -5,7 +5,7 @@
     project-name: 'dmaap-messagerouter-docker'
     jobs:
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-params: '-P docker -Dmaven.test.skip=true'
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
@@ -21,7 +21,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dmaap-messagerouter-docker-clm
@@ -30,7 +30,7 @@
     nexus-iq-namespace: 'onap-'
     project: dmaap/messagerouter/messageservice
     project-name: 'dmaap-messagerouter-docker'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
 
index ba23d9a..3c0df03 100644 (file)
@@ -28,7 +28,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/messageservice'
     project-name: 'dmaap-messagerouter-messageservice'
     branch: 'master'
index 2d32ea0..331176a 100644 (file)
@@ -30,7 +30,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/mirroragent'
     project-name: 'dmaap-messagerouter-mirroragent'
     branch: 'master'
index 90baffd..2d872f7 100644 (file)
@@ -30,7 +30,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/msgrtr'
     project-name: 'dmaap-messagerouter-msgrtr'
     branch: 'master'
index 71ca922..7620cca 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -32,7 +32,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: externalapi-nbi-arm64
@@ -74,7 +74,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'externalapi/nbi'
     project-name: 'externalapi-nbi'
     branch: 'master'
index 0df1293..f78cce7 100644 (file)
@@ -84,7 +84,7 @@
     name: '{project-name}-{stream}-docker-c-shell-daily'
     id: gerrit-docker-c-shell-daily
     <<: *c_job_common
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
 
     triggers:
       # 12 AM UTC
index 2615157..4d48b87 100644 (file)
     name: '{project-name}-{stream}-docker-golang-shell-daily'
     golangver: 'golang110'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     disabled: false
     properties:
       - infra-properties:
index bcf4bd3..7224b75 100644 (file)
 
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     disabled: '{disabled}'
     properties:
       - infra-properties:
index b30af0e..6480daa 100644 (file)
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
-
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'
-      - git-extra-project:
-          project: '{extra-project1}'
-          refspec: '{extra-refspec1}'
-          branch: '{extra-branch1}'
-          checkout-dir: '{checkout-dir1}'
-      - git-extra-project:
-          project: '{extra-project2}'
-          refspec: '{extra-refspec2}'
-          branch: '{extra-branch2}'
-          checkout-dir: '{checkout-dir2}'
-      - git-extra-project:
-          project: '{extra-project3}'
-          refspec: '{extra-refspec3}'
-          branch: '{extra-branch3}'
-          checkout-dir: '{checkout-dir3}'
 
     wrappers:
       - infra-wrappers-docker-build:
index 1ee505f..831c770 100644 (file)
@@ -18,6 +18,7 @@
     name: '{project-name}-{stream}-{area}-verify-shell'
     node: '{build-node}'
     type: freestyle
+    concurrent: true
 
     pattern: '**'
 
           branch: '{branch}'
           files: '{pattern}'
 
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
     builders:
       - shell: '{script}'
 
index 3f8816e..9b6824c 100644 (file)
@@ -25,7 +25,7 @@
     mvn-settings: 'holmes-common-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: holmes-common-sonar
@@ -37,7 +37,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/common'
     project-name: 'holmes-common'
     branch: 'master'
index cb23377..f9c19be 100644 (file)
@@ -11,7 +11,7 @@
           maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'holmes/engine-management'
@@ -23,7 +23,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: holmes-engine-management-sonar
@@ -35,7 +35,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/engine-management'
     project-name: 'holmes-engine-management'
     branch: 'master'
index 7e4342b..347c6b7 100644 (file)
@@ -11,7 +11,7 @@
           maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'holmes/rule-management'
@@ -23,7 +23,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: holmes-rule-management-sonar
@@ -35,7 +35,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/rule-management'
     project-name: 'holmes-rule-management'
     branch: 'master'
diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
deleted file mode 100644 (file)
index 4d0945a..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-set +e  # Do not affect the build result if some part of archiving fails.
-
-# Print out git status at the end of the build before we archive if $WORKSPACE
-# is a git repo.
-if [ -d "$WORKSPACE/.git" ]; then
-    echo ""
-    echo "----------> Git Status Report"
-    git status
-fi
-
-echo ""
-echo "----------> Archiving build to logs server"
-# Configure wget to not print download status when we download logs or when
-# Jenkins is installing Maven (To be clear this is the Jenkins Maven plugin
-# using a shell script itself that we are unable to modify directly to affect
-# wget).
-echo "verbose=off" > ~/.wgetrc
-
-ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
-[ "$LOGS_SERVER" ] || LOGS_SERVER="https://logs.onap.org"
-[ "$LOGS_REPO_URL" ] || LOGS_REPO_URL="https://nexus.onap.org/service/local/repositories/logs"
-
-echo "Build logs: <a href=\"$LOGS_SERVER/$SILO/$ARCHIVES_DIR\">$LOGS_SERVER/$SILO/$ARCHIVES_DIR</a>"
-
-mkdir .archives
-cd .archives/ || exit 1
-
-cat > deploy-archives.xml <<EOF
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>logs</groupId>
-  <artifactId>logs</artifactId>
-  <version>1.0.0</version>
-  <packaging>pom</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>maven-upload-plugin</artifactId>
-        <version>0.0.1</version>
-        <executions>
-          <execution>
-            <id>publish-site</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>upload-file</goal>
-            </goals>
-            <configuration>
-              <serverId>onap-log-archives</serverId>
-              <repositoryUrl>$LOGS_REPO_URL/content-compressed</repositoryUrl>
-              <file>archives.zip</file>
-              <repositoryPath>$SILO</repositoryPath>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-EOF
-
-mkdir -p "$ARCHIVES_DIR"
-mkdir -p "$WORKSPACE/archives"
-if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
-    pushd "$WORKSPACE"
-    shopt -s globstar  # Enable globstar to copy archives
-    for f in $ARCHIVE_ARTIFACTS; do
-        [[ -e $f ]] || continue  # handle the case of no files to archive
-        echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log"
-        dir=$(dirname "$f")
-        mkdir -p "$WORKSPACE/archives/$dir"
-        mv "$f" "$WORKSPACE/archives/$f"
-    done
-    shopt -u globstar  # Disable globstar once archives are copied
-    popd
-fi
-
-
-# Ignore logging if archives doesn't exist
-mv "$WORKSPACE/archives/" "$ARCHIVES_DIR" > /dev/null 2>&1
-touch "$ARCHIVES_DIR/_build-details.txt"
-echo "build-url: ${BUILD_URL}" >> "$ARCHIVES_DIR/_build-details.txt"
-env | grep -v PASSWORD > "$ARCHIVES_DIR/_build-enviroment-variables.txt"
-
-# capture system info
-touch "$ARCHIVES_DIR/_sys-info.txt"
-{
-    echo -e "uname -a:\n $(uname -a) \n"
-    echo -e "df -h:\n $(df -h) \n"
-    echo -e "free -m:\n $(free -m) \n"
-    echo -e "nproc:\n $(nproc) \n"
-    echo -e "lscpu:\n $(lscpu) \n"
-    echo -e "ip addr:\n  $(/sbin/ip addr) \n"
-} 2>&1 | tee -a "$ARCHIVES_DIR/_sys-info.txt"
-
-# Magic string used to trim console logs at the appropriate level during wget
-echo "-----END_OF_BUILD-----"
-wget -O "$ARCHIVES_DIR/console.log" "${BUILD_URL}consoleText"
-wget -O "$ARCHIVES_DIR/console-timestamp.log" "$BUILD_URL/timestamps?time=HH:mm:ss&appendLog"
-sed -i '/^-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console.log"
-sed -i '/^.*-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console-timestamp.log"
-
-gzip "$ARCHIVES_DIR"/*.txt "$ARCHIVES_DIR"/*.log
-# find and gzip any 'text' files
-find "$ARCHIVES_DIR" -type f -print0 \
-                | xargs -0r file \
-                | egrep -e ':.*text.*' \
-                | cut -d: -f1 \
-                | xargs -d'\n' -r gzip
-# Compress Java heap dumps using xz
-find "$ARCHIVES_DIR" -type f -name \*.hprof -print0 | xargs -0 xz
-
-zip -r archives.zip "$JENKINS_HOSTNAME/" >> "$ARCHIVES_DIR/_archives.log"
-du -sh archives.zip
diff --git a/jjb/include-update-pom-versions-not-parent.sh b/jjb/include-update-pom-versions-not-parent.sh
deleted file mode 100644 (file)
index ace2350..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-## Will update POM in workspace with release version
-
-if [ ! -e version.properties ]; then
-    echo "Missing version.properties"
-    exit 1
-fi
-
-## will setup variable release_version
-source ./version.properties
-
-RELEASE_VERSION=$release_version
-
-echo Changing POM version to $RELEASE_VERSION
-
-## handle POM
-for file in $(find . -name pom.xml); do
-    VERSION=$(xpath -q -e '//project/version/text()' $file)
-    PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
-    echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-    if [ "$VERSION" != "" ]; then
-        awk -v v=$RELEASE_VERSION '
-            /<version>/ {
-                if (! done) {
-                    sub(/<version>.*</,"<version>" v "<",$0)
-                    done = 1
-                }
-            }
-            { print $0 }
-        ' $file > $file.tmp
-        mv $file.tmp $file
-    fi
-    VERSION=$(xpath -q -e '//project/version/text()' $file)
-    PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
-    echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-done
-
diff --git a/jjb/include-update-pom-versions.sh b/jjb/include-update-pom-versions.sh
deleted file mode 100644 (file)
index 2d459d0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-## Will update POM in workspace with release version
-
-if [ ! -e version.properties ]; then
-    echo "Missing version.properties"
-    exit 1
-fi
-
-## will setup variable release_version
-source ./version.properties
-
-RELEASE_VERSION=$release_version
-
-echo Changing POM version to $RELEASE_VERSION
-
-## handle POM
-for file in $(find . -name pom.xml); do
-    VERSION=$(xpath -q -e '//project/version/text()' $file)
-    PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
-    echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-    if [ "$VERSION" != "" ]; then
-        awk -v v=$RELEASE_VERSION '
-            /<version>/ {
-                if (! done) {
-                    sub(/<version>.*</,"<version>" v "<",$0)
-                    done = 1
-                }
-            }
-            { print $0 }
-        ' $file > $file.tmp
-        mv $file.tmp $file
-    fi
-    if [ "$PVERSION" != "" ]; then
-        awk -v v=$RELEASE_VERSION '
-            /<version>/ {
-                if (parent && ! done) {
-                    sub(/<version>.*</,"<version>" v "<",$0)
-                    done = 1
-                }
-            }
-            /<parent>/ { parent = 1 }
-            { print $0 }
-        ' $file > $file.tmp
-        mv $file.tmp $file
-    fi
-    VERSION=$(xpath -q -e '//project/version/text()' $file)
-    PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
-    echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-done
-
diff --git a/jjb/integration/docker/info-integration-docker.yaml b/jjb/integration/docker/info-integration-docker.yaml
deleted file mode 100644 (file)
index 071f816..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- project:
-    name: integration-docker-onap-java11-info
-    project-name: integration-docker-onap-java11
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: integration/docker/onap-java11
-    branch: master
diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
new file mode 100644 (file)
index 0000000..4ad47ab
--- /dev/null
@@ -0,0 +1,63 @@
+---
+- project:
+    name: integration-docker-onap-java11-info
+    project-name: integration-docker-onap-java11
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/docker/onap-java11
+    branch: master
+
+- project:
+      name: integration-docker-onap-java11-linters
+      project: integration/docker/onap-java11
+      project-name: integration-docker-onap-java11
+      python-version: python3
+      jobs:
+          - integration-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'json':
+                tox-dir: '.'
+                tox-envs: 'json'
+                pattern: '**/*.json'
+          - 'md':
+              tox-dir: '.'
+              tox-envs: 'md'
+              pattern: '**/*.md'
+      stream:
+          - 'master':
+                branch: 'master'
+
+- project:
+    name: integration-docker-onap-java11-release
+    project-name: 'integration-docker-onap-java11'
+    project: 'integration/docker/onap-java11'
+    mvn-settings: 'integration-settings'
+    jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+- project:
+    name: 'integration-docker-onap-java11-docker'
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+    project-name: 'integration-docker-onap-java11'
+    project: 'integration/docker/onap-java11'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-name: 'onap/integration-java11'
+    docker-build-args: '-f ./Dockerfile'
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'integration-settings'
+    build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml
new file mode 100644 (file)
index 0000000..505591c
--- /dev/null
@@ -0,0 +1,63 @@
+---
+- project:
+    name: integration-docker-onap-python-info
+    project-name: integration-docker-onap-python
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/docker/onap-python
+    branch: master
+
+- project:
+      name: integration-docker-onap-python-linters
+      project: integration/docker/onap-python
+      project-name: integration-docker-onap-python
+      python-version: python3
+      jobs:
+          - integration-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'json':
+                tox-dir: '.'
+                tox-envs: 'json'
+                pattern: '**/*.json'
+          - 'md':
+              tox-dir: '.'
+              tox-envs: 'md'
+              pattern: '**/*.md'
+      stream:
+          - 'master':
+                branch: 'master'
+
+- project:
+    name: integration-docker-onap-python-release
+    project-name: 'integration-docker-onap-python'
+    project: 'integration/docker/onap-python'
+    mvn-settings: 'integration-settings'
+    jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+- project:
+    name: 'integration-docker-onap-python-docker'
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+    project-name: 'integration-docker-onap-python'
+    project: 'integration/docker/onap-python'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-name: 'onap/integration-python'
+    docker-build-args: '-f ./Dockerfile'
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'integration-settings'
+    build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
new file mode 100644 (file)
index 0000000..c3a2ab9
--- /dev/null
@@ -0,0 +1,56 @@
+---
+- project:
+    name: integration-docker-compose
+    project-name: 'integration'
+    project: 'integration'
+    stream:
+      - 'master':
+          branch: 'master'
+    jobs:
+      - integration-docker-compose-verify
+    subproject:
+      - 'netconf-pnp-simulator':
+          pattern: 'test/mocks/netconf-pnp-simulator/modules/**'
+          docker_root: 'test/mocks/netconf-pnp-simulator/modules'
+          netconf_sim_service_name: 'netconf-pnp-simulator'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker-compose up -d
+          post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+      - 'emssimulator-swm-netconf':
+          pattern: 'test/mocks/emssimulator/swm-netconf/**'
+          docker_root: 'test/mocks/emssimulator/swm-netconf'
+          netconf_sim_service_name: 'ems-netconf-swm'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker-compose up -d
+          post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+      - 'pmsh-pnf-sim':
+          pattern: 'test/mocks/pmsh-pnf-sim/docker-compose/**'
+          docker_root: 'test/mocks/pmsh-pnf-sim/docker-compose'
+          netconf_sim_service_name: 'netopeer2'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker-compose up -d
+          post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+      - 'datafilecollector-testharness':
+          pattern: 'test/mocks/datafilecollector-testharness/**'
+          docker_root: 'test/mocks/datafilecollector-testharness/simulator-group'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            ./prepare-images.sh
+            ./docker-compose-setup.sh
+      - 'prov-mns-provider':
+          pattern: 'test/mocks/prov-mns-provider/**'
+          docker_root: 'test/mocks/prov-mns-provider'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker build . -t prov-mns-provider
+            docker-compose up -d
+            cd src
+            tox
index 1d105d7..b315bc4 100644 (file)
@@ -3,8 +3,8 @@
     name: integration-docker
     project-name: 'integration'
     jobs:
-      - '{project-name}-{stream}-{subproject}-docker-merge'
-      - '{project-name}-{stream}-{subproject}-docker-verify'
+      - integration-docker-merge
+      - integration-docker-verify
     project: 'integration'
     stream:
       - 'master':
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
-      - 'pnfsimulator':
-          pom: 'test/mocks/pnfsimulator/pnfsimulator/pom.xml'
-          pattern: 'test/mocks/pnfsimulator/pnfsimulator/**'
-      - 'netconfsimulator':
-          pom: 'test/mocks/pnfsimulator/netconfsimulator/pom.xml'
-          pattern: 'test/mocks/pnfsimulator/netconfsimulator/**'
+      - 'mass-pnf-sim':
+          pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml'
+          pattern: 'test/mocks/mass-pnf-sim/**'
+          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
+          post-docker-verify-script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/test/mocks/mass-pnf-sim
+              tox
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: integration-netconf-pnp-simulator
+    project: integration
+    stream:
+      - 'master':
+          branch: 'master'
+    # Required by verifier
+    mvn-settings: 'integration-settings'
+    project-name: 'integration-netconf-pnp-simulator'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
+    docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
+    docker-root: test/mocks/netconf-pnp-simulator/engine
+    container-tag-method: yaml-file
+    post_docker_build_script: |
+        #!/bin/bash
+        set -eux
+        cd "$DOCKER_ROOT"
+        # To simplify the references inside tox.ini and tests/settings.py
+        docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+        tox
+    build-node: centos7-docker-8c-8g
+    build-timeout: 20
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
index aeb793f..9964750 100644 (file)
           vagrant plugin install vagrant-disksize
           mkdir -p ~/.ssh
 
+- builder:
+    name: integration-docker-compose-logs
+    builders:
+      - shell: !include-raw: shell/docker-compose-logs.sh
+
 - publisher:
     name: integration-robot
     publishers:
           unstable-threshold: '{unstable-if}'
           pass-threshold: '{pass-if}'
           only-critical: false
+
+- publisher:
+    name: integration-docker-compose-logs
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - FAILURE
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - integration-docker-compose-logs
index 0bf3097..9c2682d 100644 (file)
@@ -1,9 +1,11 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-merge'
+    id: integration-docker-merge
     project-type: freestyle
     node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
+    mvn-goals: 'clean package docker:build docker:push'
 
     properties:
       - infra-properties:
@@ -38,7 +40,6 @@
           files: '{pattern}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -48,7 +49,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean package docker:build docker:push'
+          goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-verify'
+    id: integration-docker-verify
     project-type: freestyle
     node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
+    mvn-goals: 'clean package docker:build'
+    post-docker-verify-script: ''
 
     properties:
       - infra-properties:
           files: '{pattern}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean package docker:build'
+          goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
           properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
+      - shell: '{post-docker-verify-script}'
 
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
+    id: integration-docker-compose-verify
+    project-type: freestyle
+    description: 'This job validates Docker Compose based projects'
+    node: 'ubuntu1804-docker-8c-8g'
+    docker_root: '$WORKSPACE'
+    post_script: ''
+    netconf_sim_service_name: ''
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - inject:
+          properties-content: |
+            DOCKER_ROOT={docker_root}
+            NETCONF_SIM_SERVICE_NAME={netconf_sim_service_name}
+      - shell: '{script}'
+      - shell: '{post_script}'
+
+    publishers:
+      - integration-docker-compose-logs
+      - lf-infra-publish
index 7d9ffed..61d09d7 100644 (file)
@@ -54,6 +54,7 @@
     #     pattern:        List of file patterns to scan
 
     name: '{project-name}-{stream}-{subproject}-lint'
+    id: integration-linters
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
     build-node: ubuntu1804-builder-4c-4g
index ef112ea..5b211d7 100644 (file)
       - 'master':
           branch: 'master'
 
-- project:
-    name: integration-netconf-pnp-simulator
-    project: integration
-    stream:
-      - 'master':
-          branch: 'master'
-    # Required by verifier
-    mvn-settings: 'integration-settings'
-    project-name: 'integration-netconf-pnp-simulator'
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
-    docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
-    docker-root: test/mocks/netconf-pnp-simulator/engine
-    container-tag-method: yaml-file
-    post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
-    build-node: centos7-docker-8c-8g
-    build-timeout: 20
-    jobs:
-      - gerrit-docker-verify
-      - gerrit-docker-merge
-
 - project:
     name: integration-linters
     project: 'integration'
     project-name: 'integration'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'
           tox-dir: '.'
           tox-envs: 'py'
           pattern: '**/*.py'
+      - 'rst':
+          tox-dir: '.'
+          tox-envs: 'rst'
+          pattern: '**/*.rst'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/integration/netconf-pnp-simulator-verify.sh b/jjb/integration/netconf-pnp-simulator-verify.sh
new file mode 100644 (file)
index 0000000..28e8ae3
--- /dev/null
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Script verifies if all services in Netconf simulator's docker
+# service container were launched successfully.
+
+echo "---> netconf-pnp-simulator-verify.sh"
+
+set -e # Exit with zero only if all commands succeed
+
+DOCKER_COMPOSE_LOG="/tmp/docker-compose.log"
+DOCKER_COMPOSE_LOG_MSG=( "success:" "entered RUNNING state" )
+DOCKER_COMPOSE_SLEEP_INTERVAL=60
+
+if [ -z ${NETCONF_SIM_SERVICE_NAME} ];
+then
+    echo "ERROR: netconf-pnp-simulator service name not set."
+    exit 1
+fi
+
+pushd $DOCKER_ROOT
+
+# Dump container logs
+sleep ${DOCKER_COMPOSE_SLEEP_INTERVAL} # Hang for a while so the services settle
+docker-compose logs --no-color > ${DOCKER_COMPOSE_LOG}
+
+# Get the supervisord services running within container
+supervisord_services=($(docker-compose exec -T ${NETCONF_SIM_SERVICE_NAME} /bin/sh -c \
+    'cat /etc/supervisord.conf /etc/supervisord.d/*' | grep -ho "program:[-a-zA-Z0-9]*" | cut -d: -f 2))
+
+# Check all services are running and fail if not
+for service in ${supervisord_services[@]};
+do
+    if ! grep -q "${DOCKER_COMPOSE_LOG_MSG[0]} $service ${DOCKER_COMPOSE_LOG_MSG[1]}" ${DOCKER_COMPOSE_LOG};
+    then
+        echo "ERROR: Service $service is not running, failing the build."
+        exit 1
+    fi
+done
diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml
new file mode 100644 (file)
index 0000000..5b07413
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-simulators-dc-simulator-info
+    project-name: integration-simulators-dc-simulator
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/simulators/dc-simulator
+    branch: master
+
+- project:
+    name: integration-simulators-dc-simulator-linters
+    project: integration/simulators/dc-simulator
+    project-name: integration-simulators-dc-simulator
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
new file mode 100644 (file)
index 0000000..ec0f970
--- /dev/null
@@ -0,0 +1,90 @@
+---
+- project:
+      name: integration-simulators-pnf-simulator
+      project-name: integration-pnf-simulator
+      stream:
+          -   'master':
+                  branch: 'master'
+                  java-version: openjdk11
+      project: 'integration/simulators/pnf-simulator'
+      mvn-settings: 'integration-simulators-pnf-simulator-settings'
+      files: '**'
+      maven-deploy-properties: |
+          deployAtEnd=true
+      archive-artifacts: ''
+      build-node: ubuntu1804-docker-8c-8g
+      jobs:
+          - '{project-name}-{stream}-verify-java':
+                mvn-goals: 'clean install'
+          - '{project-name}-{stream}-merge-java':
+                mvn-goals: 'clean deploy'
+          -  '{project-name}-gerrit-release-jobs':
+                 build-node: centos7-docker-8c-8g
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos7-docker-8c-8g
+                maven-versions-plugin: true
+                mvn-goals: 'clean deploy'
+          - gerrit-maven-docker-stage:
+                build-node: ubuntu1804-docker-8c-8g
+                container-public-registry: 'nexus3.onap.org:10001'
+                container-staging-registry: 'nexus3.onap.org:10003'
+                mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+
+- project:
+      name: integration-simulators-pnf-simulator-sonar
+      java-version: openjdk11
+      jobs:
+          - gerrit-maven-sonar
+      sonarcloud: true
+      sonarcloud-project-organization: '{sonarcloud_project_organization}'
+      sonarcloud-api-token: '{sonarcloud_api_token}'
+      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+      sonar-mvn-goal: '{sonar_mvn_goal}'
+      cron: '@daily'
+      build-node: ubuntu1804-docker-8c-8g
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
+      branch: 'master'
+      mvn-settings: 'integration-simulators-pnf-simulator-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+      name: integration-simulators-pnf-simulator-info
+      project-name: integration-pnf-simulator
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos7-builder-2c-1g
+      project: integration/simulators/pnf-simulator
+      branch: master
+
+- project:
+      name: integration-simulators-pnf-simulator-linters
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
+      python-version: python3
+      jobs:
+          - integration-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'json':
+                tox-dir: '.'
+                tox-envs: 'json'
+                pattern: '**/*.json'
+          - 'python':
+                tox-dir: '.'
+                tox-envs: 'py'
+                pattern: '**/*.py'
+      stream:
+          - 'master':
+                branch: 'master'
+
index 584d93f..895854a 100644 (file)
@@ -14,7 +14,7 @@
     project-name: integration-simulators-ran-simulator
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'
index fbf56a4..ce2743e 100644 (file)
@@ -14,7 +14,7 @@
     project-name: integration-usecases-bbs
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'
diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml
new file mode 100644 (file)
index 0000000..475b271
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-usecases-mdons-info
+    project-name: integration-usecases-mdons
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/usecases/mdons
+    branch: master
+
+- project:
+    name: integration-usecases-mdons-linters
+    project: integration/usecases/mdons
+    project-name: integration-usecases-mdons
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/xtesting/info-integration-xtesting.yaml b/jjb/integration/xtesting/info-integration-xtesting.yaml
deleted file mode 100644 (file)
index babd9f6..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- project:
-    name: integration-xtesting-info
-    project-name: integration-xtesting
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: integration/xtesting
-    branch: master
diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
new file mode 100644 (file)
index 0000000..8576963
--- /dev/null
@@ -0,0 +1,37 @@
+---
+- project:
+    name: integration-xtesting-info
+    project-name: integration-xtesting
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/xtesting
+    branch: master
+
+- project:
+      name: integration-xtesting-linters
+      project: integration/xtesting
+      project-name: integration-xtesting
+      python-version: python3
+      jobs:
+          - integration-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'json':
+                tox-dir: '.'
+                tox-envs: 'json'
+                pattern: '**/*.json'
+          - 'md':
+              tox-dir: '.'
+              tox-envs: 'md'
+              pattern: '**/*.md'
+      stream:
+          - 'master':
+                branch: 'master'
index ca2ea85..62d07a7 100644 (file)
@@ -12,7 +12,7 @@
     build-timeout: 90
 
     project-type: freestyle
-    node: ubuntu1604-docker-8c-8g                           ## Probably don't need this much
+    node: ubuntu1804-docker-8c-8g                           ## Probably don't need this much
     disable-job: false
     disabled: '{disable-job}'
 
index f0eab70..085788f 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -25,7 +25,7 @@
     mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
@@ -57,7 +57,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-aai-context-builder
     project-name: logging-analytics-pomba-pomba-aai-context-builder
     branch: master
index be776ff..0130f17 100644 (file)
@@ -18,7 +18,7 @@
     mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: logging-analytics-pomba-pomba-audit-common-sonar
@@ -30,7 +30,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-audit-common
     project-name: logging-analytics-pomba-pomba-audit-common
     branch: master
index 3f4f3cb..0fed024 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -24,7 +24,7 @@
     mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 - project:
@@ -37,7 +37,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-context-aggregator
     project-name: logging-analytics-pomba-pomba-context-aggregator
     branch: master
index 3f064c4..bc760c0 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -24,7 +24,7 @@
     mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
@@ -57,7 +57,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-network-discovery-context-builder
     project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
     branch: master
index 41855fc..17c4198 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -24,7 +24,7 @@
     mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
@@ -55,7 +55,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-sdc-context-builder
     project-name: logging-analytics-pomba-pomba-sdc-context-builder
     branch: master
index 90126a0..4b94f80 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -24,7 +24,7 @@
     mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
@@ -53,7 +53,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-sdnc-context-builder
     project-name: logging-analytics-pomba-pomba-sdnc-context-builder
     branch: master
index 159f357..8b6c391 100644 (file)
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: logging-analytics-arm64
@@ -63,7 +63,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'logging-analytics'
     project-name: 'logging-analytics'
     branch: 'master'
index 3fc4d33..f4d2365 100644 (file)
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-pom: 'distributions/msb-apigateway/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -31,7 +31,7 @@
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-apigateway-arm64
@@ -62,7 +62,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/apigateway'
     project-name: 'msb-apigateway'
     branch: 'master'
index cbe5505..84d75c8 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -25,7 +25,7 @@
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-discovery-arm64
@@ -55,7 +55,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/discovery'
     project-name: 'msb-discovery'
     branch: 'master'
index 9e37e17..c7bb49b 100644 (file)
@@ -16,7 +16,7 @@
     mvn-settings: 'msb-java-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-java-sdk-sonar
@@ -28,7 +28,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/java-sdk'
     project-name: 'msb-java-sdk'
     branch: 'master'
index 2f0c3e9..376cc1a 100644 (file)
@@ -16,7 +16,7 @@
     mvn-settings: 'msb-swagger-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-swagger-sdk-sonar
@@ -28,7 +28,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/swagger-sdk'
     project-name: 'msb-swagger-sdk'
     branch: 'master'
index 2995e7b..5bb4eeb 100644 (file)
             !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
       - '{project-name}-{stream}-{area}-verify-shell':
           area: kud-deployment
+          build-timeout: 45
           script:
             !include-raw-escape: 'kud-deployment.sh'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'multicloud/k8s'
     subproject:
       - validation-scripts:
@@ -26,7 +29,7 @@
     mvn-settings: 'multicloud-k8s-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-k8s-arm64
index 2f60151..d5b0308 100644 (file)
@@ -16,7 +16,7 @@
     mvn-settings: 'music-distributed-kv-store-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: music-distributed-kv-store-info
index 496cd60..1450e9c 100644 (file)
@@ -27,7 +27,7 @@
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index 25773fb..5f2c154 100644 (file)
@@ -16,7 +16,7 @@
     mvn-settings: 'music-mdbc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index 295a49e..93ffe45 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -24,7 +24,7 @@
     mvn-settings: 'music-prom-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index b89c750..0d15236 100644 (file)
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: music-sonar
@@ -44,7 +44,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'music'
     project-name: 'music'
     branch: 'master'
index 29d9422..5e96e18 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: offline-installer
     project-name: 'offline-installer'
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
 
     stream:
index 5868f9f..4b0803c 100644 (file)
@@ -35,6 +35,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'dublin':
           branch: 'dublin'
       - 'casablanca':
index 1455f7f..8defb44 100644 (file)
@@ -13,7 +13,7 @@
    files: '**'
    archive-artifacts: ''
    build-timeout: 60
-   build-node: ubuntu1604-docker-8c-8g
+   build-node: ubuntu1804-docker-8c-8g
    submodule-recursive: true
 
    jobs:
diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml
new file mode 100644 (file)
index 0000000..b43b4a0
--- /dev/null
@@ -0,0 +1,61 @@
+---
+- project:
+    name: oom-readiness-info
+    project-name: oom-readiness
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: oom/readiness
+    branch: master
+
+- project:
+      name: oom-readiness-linters
+      project: oom/readiness
+      project-name: oom-readiness
+      python-version: python3
+      jobs:
+          - oom-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'py':
+                tox-dir: '.'
+                tox-envs: 'python'
+                pattern: '**/*.python'
+      stream:
+          - 'master':
+                branch: 'master'
+          - 'frankfurt':
+                branch: 'frankfurt'
+
+- project:
+    name: oom-readiness-release
+    project-name: oom-readiness
+    project: oom/readiness
+    mvn-settings: 'oom-settings'
+    jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+- project:
+    name: 'oom-readiness-docker'
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+    project-name: 'oom-readiness'
+    project: 'oom/readiness'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-name: 'onap/oom/readiness'
+    docker-build-args: '-f ./Dockerfile'
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'oom-settings'
+    build-node: ubuntu1804-docker-8c-8g
index d625aba..93fabe7 100644 (file)
           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'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-registrator-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-f pom.xml -Dmaven.test.skip=true -P linux,docker'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'oom/registrator'
@@ -25,7 +26,7 @@
     mvn-settings: 'oom-registrator-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: oom-registrator-clm
diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml
new file mode 100644 (file)
index 0000000..3134bef
--- /dev/null
@@ -0,0 +1,55 @@
+---
+- job-template:
+    # Job template for running linters against specific file formats
+    #
+    # Required Variables:
+    #     python-version: Python version to deploy in venv
+    #     tox-env:        Tox environments to run
+    #     tox-dir:        Directory containing the project's tox.ini
+    #     pattern:        List of file patterns to scan
+
+    name: '{project-name}-{stream}-{subproject}-lint'
+    id: oom-linters
+    project-type: freestyle
+    description: 'Job intended for running linters with Tox and Coala'
+    build-node: ubuntu1804-builder-4c-4g
+    node: '{build-node}'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - lf-infra-tox-parameters:
+          tox-dir: '{tox-dir}'
+          tox-envs: '{tox-envs}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - lf-infra-tox-run:
+          parallel: 'false'
+
+    publishers:
+      - lf-infra-publish
index fd76da2..e6f600c 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch:  'frankfurt'
       - 'elalto':
           branch:  'elalto'
     mvn-settings: 'oparent-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: oparent-clm
index b956da7..03b9be8 100644 (file)
@@ -25,7 +25,7 @@
 
     concurrent: false
 
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     parameters:
       - string:
@@ -71,7 +71,7 @@
 
     concurrent: false
 
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     triggers:
       - jms-messaging:
index 776133d..4ed24d8 100644 (file)
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker maven.test.skip=true'
+          mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'policy/apex-pdp'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-apex-pdp-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-apex-pdp-jdk8
+    project-name: 'policy-apex-pdp'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/apex-pdp'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-apex-pdp-sonar
     jobs:
index 4c4c47d..0e55d52 100644 (file)
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'policy/api'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-api-jdk8
+    project-name: 'policy-api'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/api'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-api-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-api-sonar
     jobs:
index 006ad3b..e3e0ce8 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-common-settings'
     java-version: openjdk11
     files: '**'
index 38759ff..16025c0 100644 (file)
@@ -9,6 +9,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'apex-pdp'
     trigger_jobs:
@@ -26,6 +28,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'distribution'
     trigger_jobs:
@@ -42,6 +46,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'api'
     trigger_jobs:
@@ -59,6 +65,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
@@ -76,6 +84,8 @@
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'pap'
     trigger_jobs:
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'drools-pdp'
     trigger_jobs:
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
     functionality:
       - 'drools-applications'
     trigger_jobs:
index 9cb4ca0..60a04fd 100644 (file)
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'policy/distribution'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-distribution-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-distribution-jdk8
+    project-name: 'policy-distribution'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/distribution'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-distribution-sonar
     jobs:
index d255266..3e57c82 100644 (file)
           mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'policy/drools-applications'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
+
+- project:
+    name: policy-drools-applications-jdk8
+    project-name: 'policy-drools-applications'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/drools-applications'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-drools-applications-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-drools-applications-sonar
     jobs:
index 6440e35..2d44a1f 100644 (file)
           mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'policy/drools-pdp'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-drools-pdp-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-drools-pdp-jdk8
+    project-name: 'policy-drools-pdp'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/drools-pdp'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-drools-pdp-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-drools-pdp-sonar
     jobs:
index 9f8030a..3edf9dc 100644 (file)
@@ -2,6 +2,36 @@
 - project:
     name: policy-engine
     project-name: 'policy-engine'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
+    project: 'policy/engine'
+    stream:
+      - 'frankfurt':
+          branch: 'frankfurt'
+    mvn-settings: 'policy-engine-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: policy-engine-jdk8
+    project-name: 'policy-engine'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java':
 
     project: 'policy/engine'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-engine-settings'
-    java-version: openjdk11
+    java-version: openjdk8
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -44,7 +74,7 @@
     build-node: ubuntu1804-builder-4c-4g
     project: 'policy/engine'
     project-name: 'policy-engine'
-    branch: 'master'
+    branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
     java-version: openjdk11
     mvn-goals: 'clean install'
@@ -58,7 +88,7 @@
     nexus-iq-namespace: 'onap-'
     project: policy/engine
     project-name: 'policy-engine'
-    branch: 'master'
+    branch: 'frankfurt'
     mvn-settings: 'policy-engine-settings'
     java-version: openjdk11
     build-node: 'ubuntu1804-builder-4c-4g'
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: policy/engine
-    branch: master
+    branch: frankfurt
index 0b9e637..a3a7b31 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-models-settings'
     java-version: openjdk11
     files: '**'
index 75c9e22..5d9dd5f 100644 (file)
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'policy/pap'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-pap-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-pap-jdk8
+    project-name: 'policy-pap'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/pap'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-pap-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-pap-sonar
     jobs:
index 7901d4f..8d803fa 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-parent-settings'
     java-version: openjdk11
     files: '**'
index a4982aa..e5f3fb9 100644 (file)
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'policy/xacml-pdp'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'policy-xacml-pdp-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-xacml-pdp-jdk8
+    project-name: 'policy-xacml-pdp'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/xacml-pdp'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-xacml-pdp-settings'
+    java-version: openjdk8
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-xacml-pdp-sonar
     jobs:
index 43b56a9..dca6674 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.6.0':
-          branch: 'release-2.6.0'
+      - 'release-3.2.0':
+          branch: 'release-3.2.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: portal-sdk-sonar
@@ -41,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'portal/sdk'
     project-name: 'portal-sdk'
     branch: 'master'
@@ -56,7 +56,7 @@
       - gerrit-maven-clm:
           mvn-params: '-f ecomp-sdk/pom.xml'
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: portal/sdk
     project-name: 'portal-sdk'
     branch: 'master'
index a45188d..04a6374 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'release-3.2.0':
+          branch: 'release-3.2.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     extra-project: 'portal/sdk'
     extra-branch: '{branch}'
     extra-refspec: 'refs/heads/{branch}'
index fa76df1..325d79a 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'release-3.2.0':
+          branch: 'release-3.2.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER
 
 - project:
@@ -37,7 +39,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'portal'
     project-name: 'portal'
     branch: 'master'
@@ -51,7 +53,7 @@
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     project: 'portal'
     project-name: 'portal'
     branch: 'master'
@@ -88,7 +90,7 @@
     project: portal
     project-name: 'portal'
     branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-settings: 'portal-settings'
 
 - project:
index 756618e..018a649 100644 (file)
@@ -58,8 +58,8 @@
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
+    build-node: ubuntu1804-docker-8c-8g
+    maven-version: 'mvn36'
 
 #- project:
 #    name: sdc-arm64
@@ -90,7 +90,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
index 1a6bdc4..af1be77 100644 (file)
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'so/libs'
     project-name: 'so-libs'
     branch: 'master'
index cb7d0c9..f408d95 100644 (file)
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-sonar
@@ -45,7 +45,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -58,7 +58,7 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu1804-builder-4c-4g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -88,7 +88,7 @@
     nexus-iq-namespace: 'onap-'
     project: so
     project-name: 'so'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
     build-node: centos7-builder-2c-1g
     project: so
     branch: master
-    branch: elalto
+    branch: frankfurt
index 2c46a15..77f8cb5 100644 (file)
@@ -23,7 +23,7 @@
     mvn-settings: 'testsuite-heatbridge-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: testsuite-heatbridge-master-clm
@@ -32,7 +32,7 @@
     nexus-iq-namespace: 'onap-'
     project: testsuite/heatbridge
     project-name: 'testsuite-heatbridge'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'testsuite-heatbridge-settings'
 
index 7d0eb5d..cb70a08 100644 (file)
 
     project: 'testsuite'
 
-    extra-project1: 'testsuite/python-testing-utils'
-    extra-branch1: '{branch}'
-    extra-refspec1: 'refs/heads/{branch}'
-    checkout-dir1: 'testsuite/eteutils'
-
-    extra-project2: 'testsuite/heatbridge'
-    extra-branch2: '{branch}'
-    extra-refspec2: 'refs/heads/{branch}'
-    checkout-dir2: 'testsuite/heatbridge'
-
-    extra-project3: 'demo'
-    extra-branch3: '{branch}'
-    extra-refspec3: 'refs/heads/{branch}'
-    checkout-dir3: 'demo'
-
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'testsuite-settings'
@@ -63,7 +46,7 @@
     project-name: 'testsuite'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'
diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml
deleted file mode 100644 (file)
index e4e112f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: usecases-5G-bulkpm-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com rajendra.jaiswal@ericsson.com liam.burke@ericsson.com'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - '5G-bulkpm':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
index 69e92f8..8e70983 100644 (file)
@@ -1,19 +1,49 @@
 ---
 - project:
-    name: usecases-csit
+    name: usecases-5G-bulkpm-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech eric.e.moore@est.tech raj.gumma@ericsson.com'
+    project-name: 'usecases-5G-bulkpm'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com lego@est.tech'
     stream:
       - 'master':
           branch: 'master'
     functionality:
-      - 'config-over-netconf':
+      - '5G-bulkpm':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+
+- project:
+    name: usecases-pnf-sw-upgrade
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases-pnf-sw-upgrade'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
       - 'pnf-sw-upgrade':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
+
+- project:
+    name: usecases-config-over-netconf
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases-config-over-netconf'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'config-over-netconf':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+
diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
deleted file mode 100644 (file)
index cb43838..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: vfc-nfvo-catalog-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-catalog'
-    recipients: 'yangyanyj@chinamobile.com'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
index c300a50..6f734e5 100644 (file)
@@ -9,8 +9,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'healthCheck':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
index a8668dc..75da082 100644 (file)
@@ -27,8 +27,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
index 291011c..5c7716f 100644 (file)
@@ -21,7 +21,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -31,7 +31,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
 #- project:
 #    name: vnfsdk-dovetail-integration-arm64
 #    project-name: 'vnfsdk-dovetail-integration-arm64'
@@ -56,7 +56,7 @@
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
@@ -80,6 +80,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/dovetail-integration
     project-name: 'vnfsdk-dovetail-integration'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
index 3a29d41..57e12fc 100644 (file)
@@ -17,7 +17,7 @@
     mvn-settings: 'vnfsdk-functest-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-functest-sonar
@@ -29,7 +29,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
@@ -53,6 +53,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/functest
     project-name: 'vnfsdk-functest'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-functest-settings'
index 7b2a773..6d22310 100644 (file)
@@ -14,7 +14,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-pkgtools-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{subproject}-python-staging-{stream}'
@@ -25,7 +25,7 @@
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/pkgtools'
     project-name: 'vnfsdk-pkgtools'
     branch: 'master'
index 9475435..d435641 100644 (file)
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-f vnfmarket-be/deployment/docker/docker-refrepo/pom.xml -P docker -Dmaven.test.skip=true -Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003'
-          mvn-pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
+          mvn-goals: 'clean package -Pdocker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -22,7 +21,7 @@
 #          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-Dmaven.test.skip=true'
-#          build-node: ubuntu1604-docker-8c-8g
+#          build-node: ubuntu1804-docker-8c-8g
     project: 'vnfsdk/refrepo'
     stream:
       - 'master':
@@ -30,7 +29,7 @@
     mvn-settings: 'vnfsdk-refrepo-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: vnfsdk-refrepo-arm64
@@ -63,7 +62,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
@@ -87,6 +86,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/refrepo
     project-name: 'vnfsdk-refrepo'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-refrepo-settings'
index f5e7f43..3d5a602 100644 (file)
@@ -18,7 +18,7 @@
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-validation-sonar
@@ -30,7 +30,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
@@ -54,6 +54,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/validation
     project-name: 'vnfsdk-validation'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
index b0a6a2c..7d41914 100644 (file)
@@ -31,7 +31,7 @@
     mvn-settings: 'vnfsdk-ves-agent-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-ves-agent-sonar
@@ -54,7 +54,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
@@ -80,6 +80,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/ves-agent
     project-name: 'vnfsdk-ves-agent'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-ves-agent-settings'
index ef6fedc..f17b3db 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-virtualenv -p python3.6 $WORKSPACE/venv-tox
+python3 -m venv $WORKSPACE/venv-tox
 source $WORKSPACE/venv-tox/bin/activate
 pip3 install --upgrade pip
 pip3 install --no-use-pep517 -r requirements.txt
index 9e2cc94..9f9b85e 100644 (file)
@@ -12,7 +12,7 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-validation-scripts-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
@@ -32,7 +32,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
     branch: 'master'
@@ -44,7 +44,7 @@
     name: vvp-validation-scripts-tracability-matrix
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'vvp-validation-scripts-settings'
     mvn-global-settings: 'global-settings'
     stream:
index daed681..daecffe 100644 (file)
@@ -6,8 +6,8 @@
   become_method: sudo
 
   vars:
-    kubectl_version: 1.11.2
-    helm_version: 2.12.3
+    kubectl_version: 1.15.11
+    helm_version: 2.16.6
 
   tasks:
     - name: 'Install kubectl {{kubectl_version}}'
@@ -36,4 +36,3 @@
           command: 'which helm'
         - name: 'Check kubectl.'
           command: 'which kubectl'
-
diff --git a/shell/docker-compose-logs.sh b/shell/docker-compose-logs.sh
new file mode 100644 (file)
index 0000000..87bcd69
--- /dev/null
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Dump Docker Compose info
+
+set +e  # Do not fail build if any of script command fails
+set -x
+
+echo "---> docker-compose-logs.sh"
+
+cd $DOCKER_ROOT
+docker-compose config
+docker-compose ps
+docker-compose top
+docker-compose images
+
+# Do not fail build if script fails.
+exit 0