Merge "update dmaap mr UBuntu buld nodes to 18.04"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 31 Mar 2020 16:13:35 +0000 (16:13 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 31 Mar 2020 16:13:35 +0000 (16:13 +0000)
203 files changed:
jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg [new file with mode: 0644]
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-certservice-csit.yaml
jjb/aaf/aaf-certservice.yaml
jjb/aaf/aaf-luaplugin.yaml
jjb/aaf/aaf-sms.yaml
jjb/aaf/aaf-sshsm.yaml
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-cacher.yaml
jjb/aai/aai-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-graphgraph.yaml
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-oom.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-router-core-service.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-search-data-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-traversal.yaml
jjb/aai/aai-validation.yaml
jjb/appc/appc-cdt.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/appc/appc-parent.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/dashboard.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/clamp/clamp.yaml
jjb/clamp/dashboard/clamp-dashboard.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.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-oti-eventproc.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/demo/demo.yaml
jjb/externalapi/externalapi-nbi.yaml
jjb/global-defaults.yaml
jjb/global-macros.yaml
jjb/global-templates-golang.yaml
jjb/global-templates-helm.yaml
jjb/integration/integration-docker.yaml
jjb/integration/integration-templates-csit.yaml
jjb/integration/integration-templates-docker.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration.yaml
jjb/integration/simulators/integration-ran-simulator.yaml [new file with mode: 0644]
jjb/integration/usecases/integration-usecases-bbs.yaml [new file with mode: 0644]
jjb/lab/lab-templates.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/modeling-etsicatalog.yaml
jjb/modeling/modeling-toscaparsers-nfvparser.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/multicloud/multicloud-azure-java.yaml
jjb/multicloud/multicloud-azure-python.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-framework-python.yaml
jjb/multicloud/multicloud-k8s.yaml
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack-vmware-python.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music.yaml
jjb/oom/oom-helm.yaml
jjb/oom/oom-registrator.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-fgps.yaml
jjb/optf/optf-has-csit.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf-csit.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-engine.yaml
jjb/policy/policy-gui.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-dcae-d-ci.yaml
jjb/sdc/sdc-dcae-d-dt-be-main.yaml
jjb/sdc/sdc-dcae-d-dt-be-property.yaml
jjb/sdc/sdc-dcae-d-dt.yaml
jjb/sdc/sdc-dcae-d-fe.yaml
jjb/sdc/sdc-dcae-d-tosca-lab.yaml
jjb/sdc/sdc-microservices.yaml
jjb/sdc/sdc-onap-ui-angular.yaml
jjb/sdc/sdc-onap-ui-common.yaml
jjb/sdc/sdc-onap-ui-react.yaml
jjb/sdc/sdc-sdc-be-common.yaml
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-pubsub.yaml
jjb/sdc/sdc-sdc-tosca.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/sdnc/sdnc-oom.yaml
jjb/so/so.yaml
jjb/testsuite/testsuite.yaml
jjb/usecases/usecases-csit.yaml [moved from jjb/usecases/config-over-netconf.yaml with 82% similarity]
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-python.yaml
jjb/vfc/vfc-nfvo-catalog.yaml
jjb/vfc/vfc-nfvo-db.yaml
jjb/vfc/vfc-nfvo-driver-ems-java.yaml
jjb/vfc/vfc-nfvo-driver-sfc.yaml
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-multivimproxy.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vid/vid.yaml
jjb/vnfrqts/build-and-upload.yaml
jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vvp/vvp-test-engine.yaml
packer/provision/local-builder.yaml
packer/provision/local-docker.yaml
packer/provision/redis.yaml
packer/vars/ubuntu-18.04-arm64.json [new file with mode: 0644]

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg
deleted file mode 100644 (file)
index d757901..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=CentOS 7 - memcached -  - 260980909-9003
-LABELS=centos7-memcached-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
deleted file mode 100644 (file)
index 9018cf4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-2c-1g
-HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
deleted file mode 100644 (file)
index 610a33d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-4c-2g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg
deleted file mode 100644 (file)
index b04a0a5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20200305-202810.251
-LABELS=ubuntu1604-docker-arm64-4c-2g
-HARDWARE_ID=lf-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg
deleted file mode 100644 (file)
index 440c37d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20200305-202810.251
-LABELS=ubuntu1604-docker-arm64-4c-4g
-HARDWARE_ID=lf-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
deleted file mode 100644 (file)
index a326f38..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
-LABELS=ubuntu1604-docker-8c-8g
-HARDWARE_ID=v1-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
deleted file mode 100644 (file)
index fb013cd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm -  - 20200124-210936.289
-LABELS=ubuntu1604-helm-2c-1g
-HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg
deleted file mode 100644 (file)
index 11e0fbb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - memcached -  - 211081010-10003
-LABELS=ubuntu1604-memcached-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
new file mode 100644 (file)
index 0000000..5e19001
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+LABELS=ubuntu1804-docker-arm64-4c-2g
+HARDWARE_ID=lf-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
new file mode 100644 (file)
index 0000000..5ece275
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+LABELS=ubuntu1804-docker-arm64-4c-4g
+HARDWARE_ID=lf-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
new file mode 100644 (file)
index 0000000..da8a241
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229
+LABELS=ubuntu1804-docker-v1-8c-8g
+HARDWARE_ID=v1-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
new file mode 100644 (file)
index 0000000..e147067
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20200311-205153.422
+LABELS=ubuntu1804-helm-2c-1g
+HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
new file mode 100644 (file)
index 0000000..6d2f06e
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120380303-3010
+LABELS=ubuntu1804-memcached-4c-4g
+HARDWARE_ID=v2-highcpu-4
index 7b73388..341547a 100644 (file)
@@ -5,6 +5,7 @@
     views:
       - project-view
 
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-authz
     project-name: 'aaf-authz'
@@ -19,7 +20,7 @@
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
           mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
-          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'
 # LF said on 2019-08-01 that this was deprecated
@@ -28,7 +29,7 @@
 #          settings: '{mvn-settings}'
 #          script:
 #            !include-raw-escape: 'build-aaf-docker-image.sh'
-#          build-node: 'ubuntu1604-docker-8c-8g'
+#          build-node: ubuntu1804-docker-8c-8g'
     project: 'aaf/authz'
     stream:
       - 'master':
@@ -47,7 +48,7 @@
 #          settings: '{mvn-settings}'
 #          script:
 #            !include-raw-escape: 'build-aaf-docker-image.sh'
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: ubuntu1804-docker-arm64-4c-2g'
 #    project: 'aaf/authz'
 #    stream:
 #      - 'master':
@@ -66,7 +67,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: 'aaf/authz'
     project-name: 'aaf-authz'
     branch: 'master'
index 65fb395..64b3bc3 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-cadi
     project-name: 'aaf-cadi'
@@ -27,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: 'aaf/cadi'
     project-name: 'aaf-cadi-shiro'
     branch: 'master'
@@ -43,7 +44,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/fproxy/pom.xml'
           mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/fproxy'
     stream:
@@ -63,7 +64,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: 'aaf/cadi'
     project-name: 'aaf-cadi-fproxy'
     branch: 'master'
@@ -79,7 +80,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/rproxy/pom.xml'
           mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/rproxy'
     stream:
     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: 'aaf/cadi'
     project-name: 'aaf-cadi-rproxy'
     branch: 'master'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/tproxy-config/pom.xml'
           mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/tproxy-config'
     stream:
index 68077b7..9f3b179 100644 (file)
@@ -1,3 +1,4 @@
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
       name: aaf-certservice-csit
       jobs:
index 8efdb43..69a24a8 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-certservice
     project-name: 'aaf-certservice'
@@ -12,7 +13,7 @@
     maven-deploy-properties: |
         deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
          mvn-goals: 'clean install'
@@ -26,7 +27,7 @@
          maven-versions-plugin: true
          mvn-goals: 'clean deploy -P docker'
       - 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: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -44,7 +45,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: 'aaf/certservice'
     project-name: 'aaf-certservice'
     branch: 'master'
index 20bf1c8..8d65de8 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-luaplugin-clm
     project-name: 'aaf-luaplugin'
index a69daaf..88932f1 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-sms
     project-name: 'aaf-sms'
@@ -24,7 +25,7 @@
     mvn-settings: 'aaf-sms-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aaf-sms-info
index 1178902..b3a45fb 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-sshsm
     project-name: 'aaf-sshsm'
@@ -18,7 +19,7 @@
     mvn-settings: 'aaf-sshsm-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aaf-sshsm-info
index 5f10f9a..448dfa3 100644 (file)
@@ -28,7 +28,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-aai-common-sonar
@@ -40,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: 'aai/aai-common'
     project-name: 'aai-aai-common'
     branch: 'master'
@@ -55,7 +55,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
@@ -81,7 +81,7 @@
       - '{project-name}-{stream}-merge-docker'
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          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'
     project-name: 'aai-aai-common'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: 'aai-aai-common-whitesource'
     project-name: 'aai-aai-common'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-params: '-P spring-boot-2-1'
index 9f3efcd..bdae075 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -31,7 +31,7 @@
     mvn-settings: 'aai-babel-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-babel-sonar
@@ -43,7 +43,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: 'aai/babel'
     project-name: 'aai-babel'
     branch: 'master'
index a578d49..30b06d5 100644 (file)
@@ -11,7 +11,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -26,7 +26,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-cacher-sonar
@@ -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: 'aai/cacher'
     project-name: 'aai-cacher'
     branch: 'master'
index ee20e92..2c34a43 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -42,7 +42,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: 'aai/data-router'
     project-name: 'aai-data-router'
     branch: 'master'
index ef1a858..7d18a86 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-f distribution/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -33,7 +33,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-esr-gui-clm
index 952eebe..f66b464 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-f standalone/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -33,7 +33,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-esr-server-sonar
@@ -45,7 +45,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: 'aai/esr-server'
     project-name: 'aai-esr-server'
     branch: 'master'
index 327eced..c08d6af 100644 (file)
@@ -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: 'aai/event-client'
     project-name: 'aai-event-client'
     branch: 'master'
index 0fb84cd..139cfd8 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-graphadmin-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: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
     branch: 'master'
index 68f6940..a6a182a 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -26,8 +26,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'aai-graphgraph-settings'
     files: '**'
     archive-artifacts: ''
     project: aai/graphgraph
     branch: master
 
-- project:
-    name: aai-graphgraph-sonar
-    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: ubuntu1604-builder-4c-4g
-    project: 'aai/graphgraph'
-    project-name: 'aai-graphgraph'
-    branch: 'master'
-    mvn-settings: 'aai-sparky-be-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
index 1c0dc70..693cc69 100644 (file)
@@ -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: 'aai/logging-service'
     project-name: 'aai-logging-service'
     branch: 'master'
index 2a9c7c1..829909b 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-model-loader-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: 'aai/model-loader'
     project-name: 'aai-model-loader'
     branch: 'master'
@@ -79,7 +79,7 @@
 - project:
     name: 'aai-model-loader-whitesource'
     project-name: 'aai-model-loader'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-model-loader-settings'
index 0e9bac8..9b92ea1 100644 (file)
@@ -25,7 +25,7 @@
     mvn-settings: 'aai-oom-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash
index 0aa2168..e930f11 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-resources-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: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'
@@ -78,7 +78,7 @@
 - project:
     name: 'aai-resources-whitesource'
     project-name: 'aai-resources'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-resources-settings'
index ffe1633..8bd004f 100644 (file)
@@ -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: 'aai/rest-client'
     project-name: 'aai-rest-client'
     branch: 'master'
index 9cb614e..f74baf2 100644 (file)
@@ -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: 'aai/router-core'
     project-name: 'aai-router-core'
     branch: 'master'
index 9351c85..b7a3e3d 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-schema-service-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: 'aai/schema-service'
     project-name: 'aai-schema-service'
     branch: 'master'
index a780e9c..fbcb6be 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -39,7 +39,7 @@
     jobs:
       - gerrit-maven-docker-stage:
           mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
-          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'
     project: 'aai/search-data-service'
@@ -61,7 +61,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: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
     branch: 'master'
@@ -93,7 +93,7 @@
 - project:
     name: 'aai-search-data-service-whitesource'
     project-name: 'aai-search-data-service'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-search-data-service-settings'
index c27ea71..60bbef5 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -42,7 +42,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: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
     branch: 'master'
@@ -74,7 +74,7 @@
 - project:
     name: 'aai-sparky-be-whitesource'
     project-name: 'aai-sparky-be'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-sparky-be-settings'
index 63596ee..3d2b427 100644 (file)
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          build-node: ubuntu1604-builder-4c-4g
+          build-node: ubuntu1804-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -40,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: 'aai/sparky-fe'
     project-name: 'aai-sparky-fe'
     branch: 'master'
index e359715..d2922c3 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-traversal-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: 'aai/traversal'
     project-name: 'aai-traversal'
     branch: 'master'
index a755f5e..45f764a 100644 (file)
@@ -17,7 +17,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           mvn-params: 'docker:build -B -Dmaven.test.skip=true'
-          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'
       - '{project-name}-gerrit-release-jobs':
@@ -31,7 +31,7 @@
     mvn-settings: 'aai-validation-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-validation-sonar
@@ -43,7 +43,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: 'aai/validation'
     project-name: 'aai-validation'
     branch: 'master'
index 9a2c190..8a3f8e8 100644 (file)
@@ -19,7 +19,7 @@
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-cdt-clm
index a4ef267..4fdbb66 100644 (file)
@@ -17,7 +17,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-deployment-docker
@@ -28,7 +28,7 @@
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-versions-plugin: true
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
@@ -45,7 +45,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 #- project:
 #    name: appc-deployment-arm64-docker
@@ -64,7 +64,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: appc-deployment-info
index dd7353f..37e2272 100644 (file)
@@ -4,11 +4,11 @@
     project-name: 'appc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
           java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - '{project-name}-{stream}-merge-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
           java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - gerrit-maven-stage:
@@ -30,7 +30,7 @@
     maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-sonar
@@ -42,7 +42,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
@@ -57,7 +57,7 @@
       - gerrit-maven-clm:
           mvn-params: '-DskipTests'
           build-timeout: 60
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
     nexus-iq-namespace: 'onap-'
     project: 'appc'
index 897028c..2ada1b0 100644 (file)
@@ -24,7 +24,7 @@
           branch: 'master'
     mvn-settings: 'appc-parent-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-parent-info
index 8b2ec47..c6c3f56 100644 (file)
@@ -17,7 +17,7 @@
           sign-artifacts: true
           cron: ''
       - 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'
@@ -41,7 +41,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -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: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
@@ -78,7 +78,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-apps-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: ccsdk-apps-arm64-docker
@@ -95,7 +95,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: ccsdk-apps-info
index d8395ba..beb0c17 100644 (file)
@@ -12,7 +12,7 @@
           maven-versions-plugin: true
           cron: ''
       - 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'
@@ -26,6 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-settings'
@@ -37,7 +39,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -51,7 +53,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: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
@@ -74,7 +76,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index 764aba8..353ee2d 100644 (file)
@@ -12,7 +12,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - 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'
@@ -32,7 +32,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
index b9cd8fa..be94c4f 100644 (file)
@@ -12,7 +12,7 @@
           maven-versions-plugin: true
           cron: ''
       - 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'
@@ -33,7 +33,7 @@
     maven-version: "mvn35"
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -53,7 +53,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: ccsdk-distribution-clm
@@ -68,7 +68,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-distribution-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 
 - project:
@@ -83,7 +83,7 @@
 - project:
     name: ccsdk-distribution-whitesource
     project-name: ccsdk-distribution
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
index 0a0120e..b4a116a 100644 (file)
@@ -29,7 +29,7 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -43,7 +43,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: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
@@ -66,7 +66,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: ccsdk-features-info
@@ -79,7 +79,7 @@
 
 - project:
     name: ccsdk-features-whitesource
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
index a29b096..0d3a3ee 100644 (file)
@@ -45,7 +45,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-parent-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index 8b65dc8..ad92332 100644 (file)
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,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: 'ccsdk/sli/adaptors'
     project-name: 'ccsdk-sli-adaptors'
     branch: 'master'
@@ -68,7 +68,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
@@ -82,7 +82,7 @@
 
 - project:
     name: ccsdk-sli-adaptors-whitesource
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-whitesource-scan
index 946a4fb..0fc6d6c 100644 (file)
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,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: 'ccsdk/sli/core'
     project-name: 'ccsdk-sli-core'
     branch: 'master'
@@ -68,7 +68,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-core-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index 8cd692b..d130cb1 100644 (file)
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,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: 'ccsdk/sli/northbound'
     project-name: 'ccsdk-sli-northbound'
     branch: 'master'
@@ -68,7 +68,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index aec06db..4f99ad8 100644 (file)
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,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: 'ccsdk/sli/plugins'
     project-name: 'ccsdk-sli-plugins'
     branch: 'master'
index d292bf4..f8014bf 100644 (file)
@@ -15,7 +15,6 @@
     platforms:
       - centos-7
       - ubuntu-16.04
-      - ubuntu-16.04-arm64
       - ubuntu-18.04
     templates: builder
 
@@ -35,7 +34,7 @@
     platforms:
       - centos-7
       - ubuntu-16.04
-      - ubuntu-16.04-arm64
+      - ubuntu-18.04-arm64
       - ubuntu-18.04
     templates: docker
 
@@ -53,8 +52,7 @@
     build-timeout: 90
 
     platforms:
-      - centos-7
-      - ubuntu-16.04
+      - ubuntu-18.04
     templates: memcached
 
 - project:
@@ -86,5 +84,5 @@
     build-node: centos7-builder-2c-1g
 
     platforms:
-      - ubuntu-16.04
+      - ubuntu-18.04
     templates: helm
index dae2418..b148414 100644 (file)
     project-name: 'clamp'
     jobs:
       - gerrit-maven-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           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'
@@ -37,7 +37,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: clamp-sonar
@@ -50,7 +50,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: 'clamp'
     project-name: 'clamp'
     branch: 'master'
@@ -69,7 +69,7 @@
     project-name: 'clamp'
     branch: 'master'
     mvn-settings: 'clamp-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 120
     java-version: openjdk11
 
index 2cea7f5..ce70c19 100644 (file)
     project-name: 'clamp-dashboard'
     jobs:
       - gerrit-maven-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           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'
@@ -35,7 +35,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 #- project:
 #    name: clamp-dashboard-sonar
@@ -48,7 +48,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: 'clamp/dashboard'
 #    project-name: 'clamp-dashboard'
 #    branch: 'master'
@@ -67,6 +67,6 @@
     project-name: 'clamp-dashboard'
     branch: 'master'
     mvn-settings: 'clamp-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 120
     java-version: openjdk11
index c21ae21..ef105ff 100644 (file)
@@ -54,7 +54,7 @@
 #    mvn-settings: 'cli-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: cli-sonar
index 49a1d53..fa3ad68 100644 (file)
@@ -13,7 +13,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-v1-8c-8g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     build-timeout: 300
     jobs:
       - '{project-name}-{stream}-verify-java'
index 0b97d5a..4c626e9 100644 (file)
@@ -13,7 +13,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
       - '{project-name}-{stream}-merge-java':
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean deploy docker:build -DpushImage'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
 - project:
     name: dcaegen2-analytics-tca-gen2-sonar
     jobs:
@@ -36,7 +39,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: 'dcaegen2/analytics/tca-gen2'
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
@@ -50,7 +53,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/analytics/tca-gen2
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
index 733f9c4..3231fae 100644 (file)
@@ -13,7 +13,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
@@ -22,7 +22,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - 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-goals: 'clean package docker:build -DpushImageTag'
@@ -41,7 +41,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: 'dcaegen2/collectors/datafile'
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
@@ -55,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/datafile
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
index a171bde..d6f7b87 100644 (file)
@@ -14,7 +14,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
           mvn-goals: 'clean install'
@@ -28,7 +28,7 @@
           maven-versions-plugin: true
           mvn-goals: 'clean deploy -Ddocker.skip'
       - 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: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -44,7 +44,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: 'dcaegen2/collectors/hv-ves'
     project-name: 'dcaegen2-collectors-hv-ves'
     branch: 'master'
@@ -61,7 +61,7 @@
     project: dcaegen2/collectors/hv-ves
     project-name: 'dcaegen2-collectors-hv-ves'
     branch: 'master'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
 
 
index 72c5a55..e06ca9e 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-docker-8c-8g
           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-goals: 'clean package docker:build -DpushImageTag'
@@ -29,7 +29,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-restconf-sonar
@@ -41,7 +41,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: 'dcaegen2/collectors/restconf'
     project-name: 'dcaegen2-collectors-restconf'
     branch: 'master'
@@ -55,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/restconf
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-restconf'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
index b94302f..a586372 100644 (file)
@@ -21,7 +21,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
@@ -33,7 +33,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/collectors/snmptrap'
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
@@ -47,7 +47,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/snmptrap
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
index 43201bd..eba5e39 100644 (file)
@@ -11,7 +11,7 @@
           build-node: centos7-docker-8c-8g
           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-goals: 'clean package docker:build -DpushImageTag'
@@ -30,7 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-ves-sonar
@@ -43,7 +43,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: 'dcaegen2/collectors/ves'
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'
@@ -57,7 +57,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/ves
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
index c07a546..e1eda94 100644 (file)
@@ -20,7 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-v1-8c-8g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     build-timeout: 180
 
 - project:
@@ -28,7 +28,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: dcaegen2/deployments
     project-name: 'dcaegen2-deployments'
     branch: 'master'
index 450bd4f..8ea96a6 100644 (file)
@@ -20,7 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-blueprints-clm
@@ -28,7 +28,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/blueprints
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-blueprints'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
index 78d12ee..2203fe7 100644 (file)
@@ -14,7 +14,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     # used by tox-install.sh to specify the interpreter used to install tox
     python-version: python3
     jobs:
@@ -34,7 +34,7 @@
     project: dcaegen2/platform/configbinding
     project-name: dcaegen2-platform-configbinding
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     # Sonar jobs use maven to push report
     mvn-settings: dcaegen2-platform-configbinding-settings
     mvn-goals: 'clean test'
index c03f0d2..fdc6fa4 100644 (file)
@@ -20,7 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-deployment-handler-clm
@@ -28,7 +28,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/deployment-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-deployment-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
index 685582e..44c5bf7 100644 (file)
           stream: all
           branch: '*'
       - gerrit-docker-verify
-      - gerrit-docker-merge
+      - gerrit-docker-merge:
+          post_docker_build_script: |
+              #!/bin/bash
+              set -uex -o pipefail
+              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+              DNAME={container-snapshot-registry}/{docker-name}
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+              docker push $DNAME:$DOCKER_IMAGE_TAG2
+              docker push $DNAME:latest
+
       - gerrit-maven-clm:
           mvn-params: '-f {src-dir}'
           stream: master
@@ -71,7 +81,7 @@
     name: dcaegen2-platform-docker-python-subprojects
     project: dcaegen2/platform
     mvn-settings: dcaegen2-platform-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name:
       - dcaegen2-platform-adapter-acumos:
           src-dir: adapter/acumos
index 6f97d6f..f368dae 100644 (file)
@@ -12,7 +12,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - 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-goals: 'clean package docker:build -DpushImage'
@@ -29,7 +29,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-inventory-api-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-docker-8c-8g
     project: 'dcaegen2/platform/inventory-api'
     project-name: 'dcaegen2-platform-inventory-api'
     branch: 'master'
@@ -55,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/inventory-api
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-inventory-api'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
index 855be90..dc48e74 100644 (file)
@@ -27,4 +27,4 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
index 2402dd0..e84e83e 100644 (file)
@@ -18,7 +18,7 @@
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 
 - project:
@@ -27,7 +27,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-mod-designtool'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-settings'
index f3ad499..dea3938 100644 (file)
@@ -18,7 +18,7 @@
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dcaegen2-platform-mod-genprocessor-sonar
@@ -30,7 +30,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: 'dcaegen2/platform'
     project-name: 'dcaegen2-platform-mod-genprocessor'
     branch: 'master'
@@ -44,7 +44,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/platform'
     project-name: dcaegen2-platform-mod-genprocessor-clm
     mvn-params: '-f mod/genprocessor/pom.xml'
index cdfd3c6..3e5a85c 100644 (file)
@@ -18,7 +18,7 @@
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dcaegen2-platform-mod-runtimeapi-sonar
@@ -30,7 +30,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: 'dcaegen2/platform'
     project-name: 'dcaegen2-platform-mod-runtimeapi'
     branch: 'master'
@@ -44,7 +44,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/platform'
     project-name: dcaegen2-platform-mod-runtimeapi-clm
     mvn-params: '-f mod/runtimeapi/pom.xml'
index c38e1c8..bf5c6c4 100644 (file)
@@ -18,7 +18,7 @@
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dcaegen2-platform-oti-event-proc-release
@@ -35,7 +35,7 @@
           mvn-goals: 'clean deploy -Ddockerfile.skip -f oti/event-proc/pom.xml'
           pattern: 'oti/event-proc/**'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f oti/event-proc/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -49,7 +49,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-oti-event-proc-sonar
@@ -61,7 +61,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: 'dcaegen2/platform'
     project-name: 'dcaegen2-platform-oti-event-proc'
     branch: 'master'
@@ -76,7 +76,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/platform'
     project-name: dcaegen2-platform-oti-event-proc-clm
     mvn-params: '-f oti/event-proc/pom.xml'
index 7d403d2..9ff0471 100644 (file)
@@ -20,7 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-policy-handler-sonar
@@ -32,7 +32,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-docker-8c-8g
     project: 'dcaegen2/platform/policy-handler'
     project-name: 'dcaegen2-platform-policy-handler'
     branch: 'master'
@@ -46,7 +46,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/policy-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-policy-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
index db819a1..a456b4f 100644 (file)
@@ -12,7 +12,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - 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-goals: 'clean package docker:build -DpushImage'
@@ -30,7 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-servicechange-handler-clm
@@ -38,7 +38,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/servicechange-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-servicechange-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
index a3fd2ed..eec174a 100644 (file)
@@ -72,7 +72,7 @@
     branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     mvn-params: '-f components/bbs-event-processor/pom.xml'
-    mvn-goals: 'clean install'
+    mvn-goals: 'clean install -Ddockerfile.skip'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
index c8e76d9..017eb64 100644 (file)
@@ -18,7 +18,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-datalake-handler-release
           version-properties-file: 'components/datalake-handler/version.properties'
           pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           pattern: 'components/datalake-handler/**'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
     stream:
       - 'master':
          branch: 'master'
@@ -49,7 +47,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-datalake-handler-admin-ui-release
           version-properties-file: 'components/datalake-handler/version.properties'
           pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           pattern: 'components/datalake-handler/**'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
     stream:
       - 'master':
          branch: 'master'
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
-    name: dcaegen2-services-datalake-handler-db-init-release
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler-db-init'
-    jobs:
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          mvn-pom: 'components/datalake-handler/pom.xml'
-          mvn-params: '-f components/datalake-handler/pom.xml'
-          version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/init_db/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    stream:
-      - 'master':
-         branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-datalake-handler-sonar
     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: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     branch: 'master'
index be95546..1c2dd59 100644 (file)
           stream: master
           branch: 'master'
       - gerrit-docker-verify
-      - gerrit-docker-merge
+      - gerrit-docker-merge:
+          post_docker_build_script: |
+              #!/bin/bash
+              set -uex -o pipefail
+              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+              DNAME={container-snapshot-registry}/{docker-name}
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+              docker push $DNAME:$DOCKER_IMAGE_TAG2
+              docker push $DNAME:latest
       - gerrit-whitesource-scan:
           build-timeout: 120
           submodule-timeout: 30
index e9c8531..7a23af1 100644 (file)
@@ -21,7 +21,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-heartbeat-sonar
@@ -33,7 +33,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: 'dcaegen2/services/heartbeat'
     project-name: 'dcaegen2-services-heartbeat'
     branch: 'master'
@@ -47,7 +47,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/heartbeat
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-heartbeat'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
index 76c1337..6e0fe73 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
           mvn-goals: 'clean package docker:build -DpushImage'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -24,7 +24,7 @@
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -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: 'dcaegen2/services/mapper'
     project-name: 'dcaegen2-services-mapper'
     branch: 'master'
@@ -52,7 +52,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/mapper
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-mapper'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-mapper-settings'
index dca7dd5..f486b95 100644 (file)
@@ -13,7 +13,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
         mvn-goals: 'clean install docker:build'
@@ -26,7 +26,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - 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-goals: 'clean install docker:build docker:push'
@@ -41,7 +41,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: 'dcaegen2/services/pm-mapper'
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
@@ -55,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/pm-mapper
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
index bb5aa84..c2672c1 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-docker-8c-8g
           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-goals: 'clean package docker:build docker:push'
@@ -24,7 +24,7 @@
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -38,7 +38,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
     java-version: openjdk11
     project: 'dcaegen2/services/prh'
     project-name: 'dcaegen2-services-prh'
@@ -53,7 +53,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/prh
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk11
     project-name: 'dcaegen2-services-prh'
     branch: 'master'
index 4d90397..377a276 100644 (file)
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-{stream}-integration-pairwise':
           build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services/sdk'
     project-name: 'dcaegen2-services-sdk'
     stream:
index 27d546b..a969c81 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-docker-8c-8g
           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-goals: 'clean package docker:build -DpushImageTag'
@@ -24,7 +24,7 @@
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -38,7 +38,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: 'dcaegen2/services/son-handler'
     project-name: 'dcaegen2-services-son-handler'
     branch: 'master'
@@ -52,7 +52,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/son-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-son-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
index 9388c2b..2603a69 100644 (file)
@@ -21,7 +21,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-utils-sonar
@@ -33,7 +33,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: 'dcaegen2/utils'
     project-name: 'dcaegen2-utils'
     branch: 'master'
@@ -47,7 +47,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/utils
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-utils'
     branch: 'master'
     mvn-settings: 'dcaegen2-utils-settings'
index 5c4028e..305ca37 100644 (file)
     build-node: centos7-builder-2c-1g
     project: demo
     branch: master
+
+- project:
+    name: demo-linters
+    project: 'demo'
+    project-name: 'demo'
+    python-version: python3
+    jobs:
+      - '{project-name}-{stream}-{subproject}-lint'
+    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 ebf695c..71ca922 100644 (file)
@@ -42,7 +42,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+          build-node: 'ubuntu1804-docker-arm64-4c-2g'
     project: 'externalapi/nbi'
     stream:
       - 'master':
index 1590d01..74479f2 100644 (file)
@@ -38,7 +38,7 @@
 
     # Timeout in minutes
     build-timeout: 90
-    build-node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
 
     archive-artifacts: ''
 
index c783015..9c70eec 100644 (file)
                 exclude-no-code-change: 'false'
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: '^verify-helm$'
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
index 6305828..2615157 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- job-template:
+- job-template: &verify_golang_bolierplate
     # Job template for Golang verify jobs
     #
     # The purpose of this job template is to run:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    # Job template for Golang verify jobs with subproject support
+
+    <<: *verify_golang_bolierplate
+    name: '{project-name}-{stream}-{subproject}-verify-golang'
+
 - job-template:
     # Job template for Golang merge jobs
     #
index 12ce9a3..a147e1a 100644 (file)
@@ -20,6 +20,7 @@
     submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
+    build-timeout: 120
 
     #####################
     # Job Configuration #
@@ -55,6 +56,7 @@
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
+    concurrent: true
 
     scm:
       - gerrit-trigger-scm:
index 1066057..1d105d7 100644 (file)
@@ -22,4 +22,3 @@
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
index b7b92fd..40a6a93 100644 (file)
@@ -4,7 +4,7 @@
     disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -66,7 +66,7 @@
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
     disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
index a01e82f..0bf3097 100644 (file)
@@ -2,7 +2,7 @@
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-merge'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
 
     properties:
@@ -64,7 +64,7 @@
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-verify'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
 
     properties:
index 0cf19bc..7d9ffed 100644 (file)
@@ -8,7 +8,7 @@
     name: '{project-name}-{stream}-verify-vagrantfile'
     project-type: freestyle
     description: 'Job intended for validating vagrantfiles'
-    node: ubuntu1604-builder-2c-1g
+    node: ubuntu1804-builder-4c-4g
 
     parameters:
       - lf-infra-parameters:
@@ -56,7 +56,8 @@
     name: '{project-name}-{stream}-{subproject}-lint'
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
+    node: '{build-node}'
 
     parameters:
       - lf-infra-parameters:
index 2c2d89f..ef112ea 100644 (file)
     golangver: 'golang112'
     mvn-settings: 'integration-settings'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-2c-1g
     jobs:
-      - '{project-name}-{stream}-verify-golang':
-          script: '{build_script}'
-    path: 'test/security/k8s'
-    pattern: '{path}/**'
+      - '{project-name}-{stream}-{subproject}-verify-golang'
+    subproject:
+      - 'test-security-k8s':
+          path: 'test/security/k8s'
+          pattern: '{path}/**'
+          build-node: ubuntu1804-builder-4c-4g
+          script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/{path}
+              make test
+      - 'test-security-sslendpoints':
+          path: 'test/security/sslendpoints'
+          pattern: '{path}/**'
+          build-node: ubuntu1804-docker-8c-8g
+          script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/{path}
+              rm -rf $WORKSPACE/{path}/bin
+              make docker-build
+              make test
+              make clean
     stream:
       - 'master':
           branch: 'master'
-    build_script: |
-        #!/bin/bash
-        set -ex # Fail build if any setup step fails
-        cd test/security/k8s
-        make test
 
 - project:
     name: integration-netconf-pnp-simulator
@@ -79,6 +92,7 @@
     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:
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
new file mode 100644 (file)
index 0000000..584d93f
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-simulators-ran-simulator-info
+    project-name: integration-simulators-ran-simulator
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/simulators/ran-simulator
+    branch: master
+
+- project:
+    name: integration-simulators-ran-simulator-linters
+    project: integration/simulators/ran-simulator
+    project-name: integration-simulators-ran-simulator
+    python-version: python3
+    jobs:
+      - '{project-name}-{stream}-{subproject}-lint'
+    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/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml
new file mode 100644 (file)
index 0000000..fbf56a4
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-usecases-bbs-info
+    project-name: integration-usecases-bbs
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/usecases/bbs
+    branch: master
+
+- project:
+    name: integration-usecases-bbs-linters
+    project: integration/usecases/bbs
+    project-name: integration-usecases-bbs
+    python-version: python3
+    jobs:
+      - '{project-name}-{stream}-{subproject}-lint'
+    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'
index ff7a59d..234d1fc 100644 (file)
@@ -4,7 +4,7 @@
     description: '{job-desc}'
     disabled: false
     project-type: freestyle
-    build-node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
 
     properties:
       - lf-infra-properties:
index 4ef1801..f0eab70 100644 (file)
@@ -44,7 +44,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
index 82317ba..3f064c4 100644 (file)
@@ -44,7 +44,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
index ba9cf5d..41855fc 100644 (file)
@@ -42,7 +42,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
index a40fda1..90126a0 100644 (file)
@@ -41,7 +41,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar
index 6e6b289..159f357 100644 (file)
@@ -50,7 +50,7 @@
 #    mvn-settings: 'logging-analytics-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 
 - project:
index a58af1c..a2fc451 100644 (file)
@@ -25,7 +25,9 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+            build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
index 8e6a8e6..e816422 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'modeling-toscaparsers-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'nfvparser':
           path: 'nfvparser/'
@@ -34,7 +34,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: 'modeling/toscaparsers'
     project-name: 'modeling-toscaparsers-nfvparser'
     branch: 'master'
index cc07972..3fc4d33 100644 (file)
@@ -22,6 +22,8 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'msb/apigateway'
     stream:
       - 'master':
@@ -48,7 +50,7 @@
 #    mvn-settings: 'msb-apigateway-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: msb-apigateway-sonar
index 67eca0a..cbe5505 100644 (file)
@@ -16,6 +16,8 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-pom: 'distributions/msb-discovery/pom.xml'
           mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'msb/discovery'
     stream:
       - 'master':
@@ -34,7 +36,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-discovery-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    project: 'msb/discovery'
 #    stream:
 #      - 'master':
index 270a557..da9827b 100644 (file)
@@ -21,7 +21,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-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -29,7 +29,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-azure-arm64-java
@@ -51,7 +51,7 @@
 #            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-azure-sonar
@@ -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: 'multicloud/azure'
     project-name: 'multicloud-azure'
     branch: 'master'
index 5066a4c..8aec29b 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'multicloud-azure-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'azure':
           path: 'azure'
index 1883da9..3233118 100644 (file)
@@ -20,7 +20,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-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -34,7 +34,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-framework-arm64-java
@@ -56,7 +56,7 @@
 #            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-framework-multivimbroker-sonar
@@ -68,7 +68,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: 'multicloud/framework'
     project-name: 'multicloud-framework-multivimbroker'
     branch: 'master'
@@ -98,7 +98,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: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
index c8b4b35..d81081a 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'multicloud-framework-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'multivimbroker':
           path: 'multivimbroker'
index f8cf56f..2995e7b 100644 (file)
@@ -48,7 +48,7 @@
 #    mvn-settings: 'multicloud-k8s-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: multicloud-k8s-info
index ba897bc..4dad5cb 100644 (file)
@@ -17,7 +17,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-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -31,7 +31,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-openstack-vmware-arm64-java
@@ -51,7 +51,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #
@@ -65,7 +65,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: 'multicloud/openstack/vmware'
     project-name: 'multicloud-openstack-vmware'
     branch: 'master'
@@ -80,7 +80,7 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack/vmware
     project-name: 'multicloud-openstack-vmware'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'
 
index a23ecf3..973ca51 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'vio':
           path: 'vio'
index 1bdc5b9..764748f 100644 (file)
@@ -91,7 +91,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #
     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: 'multicloud/openstack'
     project-name: 'multicloud-openstack-windriver'
     branch: 'master'
     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: 'multicloud/openstack'
     project-name: 'multicloud-openstack-pike'
     branch: 'master'
     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: 'multicloud/openstack'
     project-name: 'multicloud-openstack-starlingx'
     branch: 'master'
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack
     project-name: 'multicloud-openstack'
-    build-node: ubuntu1604-memcached-4c-4g
+    build-node: ubuntu1804-memcached-4c-4g
     branch: 'master'
     mvn-settings: 'multicloud-openstack-settings'
 
     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: 'multicloud/openstack'
     project-name: 'multicloud-openstack-fcaps'
     branch: 'master'
     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: 'multicloud/openstack'
 #    project-name: 'multicloud-openstack-lenovo'
 #    branch: 'master'
     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: 'multicloud/openstack'
     project-name: 'multicloud-openstack-hpa'
     branch: 'master'
index b89c750..fb7bdd8 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'
@@ -32,7 +32,7 @@
     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 c276629..5868f9f 100644 (file)
@@ -6,7 +6,7 @@
     mvn-settings: oom-settings
     mvn-global-settings: global-settings
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash
index 4b5a3b3..d625aba 100644 (file)
@@ -16,6 +16,8 @@
           script:
             !include-raw-escape: 'build-registrator-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'oom/registrator'
     stream:
       - 'master':
index b4ba623..2c0d585 100644 (file)
     project-name: 'optf-cmso'
     jobs:
       - gerrit-maven-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: false
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: false
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -26,7 +26,7 @@
             - docker.push.registry=nexus3.onap.org:10003
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     stream:
       - 'master':
@@ -53,7 +53,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     project-name: 'optf-cmso'
     branch: 'master'
@@ -70,7 +70,7 @@
     nexus-iq-namespace: 'onap-'
     project: optf/cmso
     project-name: 'optf-cmso'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
index 9f3db13..5f4509b 100644 (file)
@@ -21,7 +21,7 @@
           build-node: centos7-docker-8c-8g
           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'
@@ -30,7 +30,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-fgps-valetapi
@@ -50,7 +50,7 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-fgps-docker
@@ -91,7 +91,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: 'optf/fgps'
     project-name: 'optf-fgps'
     branch: 'master'
index 583703c..73b2771 100644 (file)
@@ -1,6 +1,7 @@
 - project:
     name: optf-has-csit
     jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: optf-has
     recipients: 'snarayanan@research.att.com'
index b94af56..c657540 100644 (file)
           pattern: 'conductor/**'
           pom: 'pom.xml'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-python':
+          build-node: ubuntu1804-builder-4c-4g
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - 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'
           docker-pom: 'conductor/pom.xml'
-          mvn-goals: 'install'
           mvn-params: '-Dmaven.test.skip=true -P docker'
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
-
-- project:
-    name: optf-has-docker
-    project-name: 'optf-has'
-    project: 'optf/has'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'optf-has-settings'
-    subproject:
-      - 'conductor':
-          path: 'conductor'
-          pattern: 'conductor/**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-has-docker-image.sh'
-          build-node: queue-docker-4c-4g
-      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-has-docker-image.sh'
-          build-node: queue-docker-4c-4g
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-has-sonar
@@ -79,7 +47,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-docker-8c-8g
     project: 'optf/has'
     project-name: 'optf-has'
     branch: 'master'
@@ -94,6 +62,7 @@
     nexus-iq-namespace: 'onap-'
     project: optf/has
     project-name: 'optf-has'
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
index 9951184..7a9c7fc 100644 (file)
@@ -1,6 +1,7 @@
 - project:
     name: optf-osdf-csit
     jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: optf-osdf
     recipients: 'snarayanan@research.att.com'
index b4884b7..2607b1f 100644 (file)
@@ -36,7 +36,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-osdf-sonar
@@ -48,7 +48,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: 'optf/osdf'
     project-name: 'optf-osdf'
     branch: 'master'
@@ -62,7 +62,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: optf/osdf
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'optf-osdf'
     stream:
       - 'master':
index 1923c76..776133d 100644 (file)
@@ -19,9 +19,9 @@
           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-params: '-P docker'
+          mvn-params: '-P docker maven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -35,7 +35,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-apex-pdp-sonar
@@ -47,7 +47,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: 'policy/apex-pdp'
     project-name: 'policy-apex-pdp'
     branch: 'master'
index 534e476..4c4c47d 100644 (file)
@@ -7,13 +7,13 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
+          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: 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'
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-api-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: 'policy/api'
     project-name: 'policy-api'
     branch: 'master'
index 1499e00..006ad3b 100644 (file)
@@ -20,7 +20,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-common-sonar
@@ -32,7 +32,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: 'policy/common'
     project-name: 'policy-common'
     branch: 'master'
index 661b351..9cb4ca0 100644 (file)
@@ -7,13 +7,13 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
+          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: 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'
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-distribution-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: 'policy/distribution'
     project-name: 'policy-distribution'
     branch: 'master'
index d5c9d25..61ac6fe 100644 (file)
@@ -8,9 +8,9 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - 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'
@@ -25,7 +25,7 @@
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-base-common
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           pattern: 'do_not_match_any_file'
       - '{project-name}-{stream}-merge-java':
           project-name: 'policy-docker-arm64'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-arm64-4c-2g
+          build-node: ubuntu1804-docker-arm64-4c-2g
           pattern: 'do_not_match_any_file'
       - '{project-name}-multiarch-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           project-name: 'policy-docker-arm64'
-          build-node: ubuntu1604-docker-arm64-4c-2g
+          build-node: ubuntu1804-docker-arm64-4c-2g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
           container-public-registry: 'docker.io'
@@ -60,7 +60,7 @@
                pattern: 'do_not_match_any_file'
       - gerrit-maven-docker-stage:
           project-name: 'policy-docker-amd64'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
           container-public-registry: 'docker.io'
@@ -70,7 +70,7 @@
              - compare-type: REG_EXP
                pattern: 'do_not_match_any_file'
       - '{project-name}-docker-manifest-{stream}':
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-multiarch-docker-stage-{stream}'
 #      - '{project-name}-gerrit-release-jobs':
 #          build-node: centos7-docker-8c-8g
@@ -82,7 +82,7 @@
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
index 7935f33..d255266 100644 (file)
@@ -13,9 +13,9 @@
           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-params: '-P docker'
+          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':
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-applications-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: 'policy/drools-applications'
     project-name: 'policy-drools-applications'
     branch: 'master'
@@ -60,7 +60,7 @@
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-applications-info
index 25b45e0..6440e35 100644 (file)
@@ -13,9 +13,9 @@
           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-params: '-P docker'
+          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':
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-pdp-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: 'policy/drools-pdp'
     project-name: 'policy-drools-pdp'
     branch: 'master'
index 0ebc274..9f8030a 100644 (file)
@@ -13,9 +13,9 @@
           build-node: centos7-docker-8c-8g
           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-params: '-P docker'
+          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':
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: policy-engine-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: 'policy/engine'
     project-name: 'policy-engine'
     branch: 'master'
@@ -61,7 +61,7 @@
     branch: 'master'
     mvn-settings: 'policy-engine-settings'
     java-version: openjdk11
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: policy-engine-info
index 924ea37..862c040 100644 (file)
@@ -7,19 +7,21 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
+          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: 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'
           container-staging-registry: 'nexus3.onap.org:10003'
+          disabled: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-builder-4c-4g
+          disabled: true
 
     project: 'policy/gui'
     stream:
@@ -29,7 +31,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-gui-sonar
@@ -41,7 +43,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: 'policy/gui'
     project-name: 'policy-gui'
     branch: 'master'
@@ -66,5 +68,6 @@
     project-name: policy-gui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/gui
     branch: master
index 8b85b6e..0b9e637 100644 (file)
@@ -20,7 +20,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-models-sonar
@@ -32,7 +32,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: 'policy/models'
     project-name: 'policy-models'
     branch: 'master'
index d5f183e..75c9e22 100644 (file)
@@ -5,52 +5,21 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-pap-amd64'
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-8g
-          pattern: 'do_not_match_any_file'
-      - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-pap-arm64'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-          pattern: 'do_not_match_any_file'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - '{project-name}-multiarch-{stream}-merge-java':
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-docker-stage:
-          project-name: 'policy-pap-arm64'
-          build-node: ubuntu1604-docker-arm64-4c-2g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
       - gerrit-maven-docker-stage:
-          project-name: 'policy-pap-amd64'
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
-      - '{project-name}-docker-manifest-{stream}':
+          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-name}-multiarch-docker-stage-{stream}'
 
     project: 'policy/pap'
     stream:
@@ -60,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-pap-sonar
@@ -72,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: 'policy/pap'
     project-name: 'policy-pap'
     branch: 'master'
index 013bc3e..7901d4f 100644 (file)
@@ -20,7 +20,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-parent-clm
index 0915bf0..a4982aa 100644 (file)
@@ -7,13 +7,13 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
+          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: 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'
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-xacml-pdp-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: 'policy/xacml-pdp'
     project-name: 'policy-xacml-pdp'
     branch: 'master'
index 43b56a9..d6e1da8 100644 (file)
@@ -29,7 +29,7 @@
     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..6f896ad 100644 (file)
@@ -20,7 +20,7 @@
     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 7edb47b..e50d6cc 100644 (file)
@@ -14,6 +14,9 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-{stream}-release-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'portal'
     stream:
       - 'master':
@@ -21,7 +24,7 @@
     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:
@@ -34,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: 'portal'
     project-name: 'portal'
     branch: 'master'
@@ -48,7 +51,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'
@@ -85,7 +88,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 735f98c..bd2f1d4 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-params: '-P docker -DskipTests=true'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -38,7 +38,7 @@
 #         docker-pom: 'pom.xml'
 #         mvn-profile: 'docker'
 #         mvn-params: '-DskipTests=true'
-#         build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#         build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #    project: 'sdc/dcae-d/ci'
 #    stream:
 #      - 'master':
@@ -58,7 +58,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/ci'
     project-name: 'sdc-dcae-d-ci'
     branch: 'master'
index 8aa4bf9..0fdee27 100644 (file)
           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-params: '-P docker -DskipTests=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: 'sdc/dcae-d/dt-be-main'
     stream:
       - 'master':
@@ -29,7 +31,7 @@
 #    project-name: 'sdc-dcae-d-dt-be-main-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true'
@@ -38,7 +40,7 @@
 #      - 'master':
 #          branch: 'master'
 #    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #    build-timeout: 60
@@ -53,7 +55,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-main'
     project-name: 'sdc-dcae-d-dt-be-main'
     branch: 'master'
index 8762c08..7180195 100644 (file)
@@ -28,7 +28,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-property'
     project-name: 'sdc-dcae-d-dt-be-property'
     branch: 'master'
index 0d91303..41847c3 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sdc-dcae-d-dt
     project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
           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-params: '-P server,docker -DskipTests=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: 'sdc/dcae-d/dt'
     stream:
 #- project:
 #    name: sdc-dcae-d-dt-arm64
 #    project-name: 'sdc-dcae-d-dt-arm64'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'server,docker'
 #          mvn-params: '-DskipTests=true'
@@ -55,7 +57,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/dt'
     project-name: 'sdc-dcae-d-dt'
     branch: 'master'
@@ -71,7 +73,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/dt
     project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-settings'
 
index b156afd..fa80c53 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sdc-dcae-d-fe
     project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
           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-params: '-P docker -DskipTests=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: 'sdc/dcae-d/fe'
     stream:
@@ -31,7 +33,7 @@
 #    project-name: 'sdc-dcae-d-fe-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true'
@@ -54,7 +56,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/fe'
     project-name: 'sdc-dcae-d-fe'
     branch: 'master'
@@ -70,7 +72,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/fe
     project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-fe-settings'
 
index fc0fd42..1165d58 100644 (file)
         path: '.'
         pattern: '**'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P default -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
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 
@@ -35,7 +37,7 @@
 #        path: '.'
 #        pattern: '**'
 #    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-java-daily':
 #          mvn-params: '-Dmaven.test.skip=true'
@@ -52,7 +54,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'sdc/dcae-d/tosca-lab'
     project-name: 'sdc-dcae-d-tosca-lab'
     branch: 'master'
index 5fc7242..0aad248 100644 (file)
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-DskipTests=true'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -45,7 +45,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/microservices'
     project-name: 'sdc-microservices'
     branch: 'master'
index f3cf944..ef6ff5a 100644 (file)
@@ -40,7 +40,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-angular'
     project-name: 'sdc-onap-ui-angular'
     branch: 'master'
index d2f5806..7f6689f 100644 (file)
@@ -34,7 +34,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-common'
     project-name: 'sdc-onap-ui-common'
     branch: 'master'
index bac85d2..45b9792 100644 (file)
@@ -34,7 +34,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-react'
     project-name: 'sdc-onap-ui-react'
     branch: 'master'
index b9e51a6..487967d 100644 (file)
@@ -39,7 +39,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-be-common'
     project-name: 'sdc-sdc-be-common'
     branch: 'master'
index f509791..7250a84 100644 (file)
@@ -38,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-distribution-client'
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
index 6507f4f..57726b7 100644 (file)
@@ -5,14 +5,14 @@
     project-name: 'sdc-sdc-docker-base'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: 'ubuntu1604-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-v1-8c-8g'
           docker-pom: 'pom.xml'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1604-docker-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'default'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P default'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -26,7 +26,7 @@
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
@@ -34,7 +34,7 @@
 #    project-name: 'sdc-sdc-docker-base-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-sdc-merge-java':
-#          build-node: 'ubuntu1604-docker-8c-8g'
+#          build-node: 'ubuntu1804-docker-8c-8g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'default'
 #    project: 'sdc/sdc-docker-base'
@@ -44,7 +44,7 @@
 #    mvn-settings: 'sdc-sdc-docker-base-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 
 - project:
index 7856426..adaa2d5 100644 (file)
@@ -34,7 +34,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-pubsub'
     project-name: 'sdc-sdc-pubsub'
     branch: 'master'
index 798a7a6..51d91ee 100644 (file)
@@ -38,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-tosca'
     project-name: 'sdc-sdc-tosca'
     branch: 'master'
index ca0408a..9bc31df 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-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
@@ -53,7 +53,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
@@ -66,7 +66,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-workflow-designer'
     project-name: 'sdc-sdc-workflow-designer'
     branch: 'master'
@@ -82,7 +82,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
 
index 71296e4..756618e 100644 (file)
@@ -30,7 +30,7 @@
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1604-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-v1-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
@@ -41,7 +41,7 @@
           maven-versions-plugin: true
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
           container-public-registry: 'nexus3.onap.org:10001'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
@@ -64,7 +66,7 @@
 #    project-name: 'sdc-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
 - project:
     name: sdc-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          build-timeout: 120
     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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc-catalog'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
 
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc-onboarding'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
 
 - project:
     name: 'sdc-whitesource'
     project-name: 'sdc'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan:
           build-timeout: 120
index 39a8977..0b04a27 100644 (file)
@@ -17,7 +17,7 @@
           build-node: centos7-builder-4c-4g
           cron: ''
       - 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'
@@ -30,6 +30,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -40,7 +42,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -54,7 +56,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: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
@@ -79,7 +81,7 @@
 #    mvn-settings: 'sdnc-apps-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-apps-clm
@@ -88,7 +90,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/apps
     project-name: 'sdnc-apps'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
index 85293ea..ee7c79d 100644 (file)
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -27,7 +29,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -41,7 +43,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: 'sdnc/northbound'
     project-name: 'sdnc-northbound'
     branch: 'master'
@@ -57,7 +59,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/northbound
     project-name: 'sdnc-northbound'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
index c39db40..8cba7aa 100644 (file)
@@ -13,7 +13,7 @@
           maven-versions-plugin: true
           cron: ''
       - 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'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdnc-oam-settings'
     maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     shallow-clone: true
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -51,7 +53,7 @@
 #    mvn-settings: 'sdnc-oam-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-oam-clm
@@ -60,7 +62,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/oam
     project-name: 'sdnc-oam'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
index 1ab6862..ae86ef5 100644 (file)
@@ -17,7 +17,7 @@
     mvn-settings: 'sdnc-oom-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash
index 323bca4..cb7d0c9 100644 (file)
@@ -16,9 +16,9 @@
           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-params: '-P docker -Dmaven.test.skip=true'
+          mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: so-sonar
@@ -45,7 +45,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'so'
     project-name: 'so'
     branch: 'master'
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     project: 'so'
     project-name: 'so'
     branch: 'master'
     mvn-settings: 'so-settings'
-    mvn-params: '-Dmaven.test.skip=true'
+    mvn-params: '-DskipTests'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     coverity-project-name: 'onap-so'
     coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ'
@@ -88,7 +88,7 @@
     nexus-iq-namespace: 'onap-'
     project: so
     project-name: 'so'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
index df3be18..7d0eb5d 100644 (file)
       - 'yaml':
           tox-dir: '.'
           tox-envs: 'yaml'
-          pattern: '**/*.yaml|**/*.yml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
       - 'json':
           tox-dir: '.'
           tox-envs: 'json'
           pattern: '**/*.json'
-      - 'robot':
-          tox-dir: '.'
-          tox-envs: 'robot'
-          pattern: '**/*.robot'
+#      - 'robot':
+#          tox-dir: '.'
+#          tox-envs: 'robot'
+#          pattern: '**/*.robot'
     stream:
       - 'master':
           branch: 'master'
similarity index 82%
rename from jjb/usecases/config-over-netconf.yaml
rename to jjb/usecases/usecases-csit.yaml
index 27491d1..69e92f8 100644 (file)
@@ -13,4 +13,7 @@
       - 'config-over-netconf':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
+      - 'pnf-sw-upgrade':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
index a19dcd6..a4241e7 100644 (file)
           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
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-server-sonar
@@ -34,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: 'usecase-ui/server'
     project-name: 'usecase-ui-server'
     branch: 'master'
@@ -49,7 +51,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui/server
     project-name: 'usecase-ui-server'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-server-settings'
 
index ee8356b..4965f82 100644 (file)
           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
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-clm
@@ -36,7 +38,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui
     project-name: 'usecase-ui'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-settings'
 
index b93bf60..e05273b 100644 (file)
@@ -29,7 +29,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
index 4412d09..1445f9b 100644 (file)
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-gvnfm-vnfmgr-mgr-sonar
@@ -41,7 +41,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f mgr/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/gvnfm/vnfmgr'
     project-name: 'vfc-gvnfm-vnfmgr-mgr'
     branch: 'master'
@@ -56,7 +56,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/gvnfm/vnfmgr
     project-name: 'vfc-gvnfm-vnfmgr'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
 
index 6c9afed..2bb891b 100644 (file)
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'mgr':
           path: 'mgr'
index 8fbf442..6551d45 100644 (file)
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-gvnfm-vnfres-res-sonar
@@ -42,7 +42,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f res/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/gvnfm/vnfres'
     project-name: 'vfc-gvnfm-vnfres-res'
     branch: 'master'
@@ -57,7 +57,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/gvnfm/vnfres
     project-name: 'vfc-gvnfm-vnfres'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
 
index f172330..5bdf8e4 100644 (file)
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'res':
           path: 'res'
index e12807d..0e46c40 100644 (file)
@@ -25,7 +25,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
index 87c4907..679cc45 100644 (file)
@@ -7,7 +7,7 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-db-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
index b79fdcc..85e9d68 100644 (file)
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-driver-ems-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-ems-sonar
@@ -41,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/ems'
     project-name: 'vfc-nfvo-driver-ems'
     branch: 'master'
@@ -56,7 +56,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/ems
     project-name: 'vfc-nfvo-driver-ems'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-ems-settings'
 
index 5130e9c..407a615 100644 (file)
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-sfc-sonar
@@ -43,7 +43,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f zte/sfc-driver/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/sfc'
     project-name: 'vfc-nfvo-driver-sfc'
     branch: 'master'
@@ -58,7 +58,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/sfc
     project-name: 'vfc-nfvo-driver-sfc'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-sfc-settings'
 
index 19cf0b4..f878452 100644 (file)
@@ -24,7 +24,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-sonar
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-params: '-f huawei/pom.xml'
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
@@ -53,7 +53,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
 
index 95a4dee..db89aff 100644 (file)
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
@@ -44,7 +44,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f gvnfmadapter/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/vnfm/gvnfm'
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
     branch: 'master'
@@ -59,7 +59,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/gvnfm
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
 
index 0990efb..0f56d0c 100644 (file)
@@ -17,7 +17,7 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-juju-sonar
@@ -29,7 +29,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-params: '-f juju/juju-vnfmadapter/pom.xml'
     project: 'vfc/nfvo/driver/vnfm/gvnfm'
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm-juju'
index 2552386..0cad04b 100644 (file)
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'gvnfmadapter':
           path: 'gvnfmadapter'
index 6807afa..ac6138a 100644 (file)
@@ -14,8 +14,8 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
index 193df51..88607eb 100644 (file)
@@ -24,7 +24,7 @@
           build-node: centos7-docker-8c-8g
     files: 'nokiav2/**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker
@@ -64,7 +64,7 @@
           docker_registry: '$DOCKER_REGISTRY:10003'
     files: 'nokiav2/**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
@@ -83,7 +83,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm
@@ -93,6 +93,6 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index d97ec98..52aee73 100644 (file)
@@ -13,7 +13,7 @@
           mvn-params: '-P rootOnly'
           pattern: 'pom.xml'
       - '{project-name}-{stream}-merge-profile-java':
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           pattern: 'pom.xml'
       - gerrit-maven-stage:
           sign-artifacts: true
@@ -21,7 +21,7 @@
           maven-versions-plugin: true
           mvn-params: '-P rootOnly'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-svnfm-root-info
index 13f5945..db2b6bb 100644 (file)
@@ -24,7 +24,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
@@ -37,7 +37,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f zte/vmanager/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
     branch: 'master'
@@ -53,6 +53,6 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index 39d7eb8..5c77ac2 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'drv-vnfm-zte':
           path: 'zte/vmanager'
index ff6c94b..fd848c5 100644 (file)
@@ -19,7 +19,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     files: '**'
index d9601cb..16866a8 100644 (file)
@@ -7,7 +7,7 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       -  '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
 
@@ -34,7 +34,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/multivimproxy'
     project-name: 'vfc-nfvo-multivimproxy'
     branch: 'master'
@@ -49,7 +49,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/multivimproxy
     project-name: 'vfc-nfvo-multivimproxy'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-multivimproxy-settings'
 
index 35992f8..b162ab8 100644 (file)
@@ -7,7 +7,7 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       -  '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
 
@@ -34,7 +34,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/resmanagement'
     project-name: 'vfc-nfvo-resmanagement'
     branch: 'master'
@@ -49,7 +49,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/resmanagement
     project-name: 'vfc-nfvo-resmanagement'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-resmanagement-settings'
 
index 4d650c3..ca51fc3 100644 (file)
@@ -27,7 +27,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-wfengine-engine-mgr-service-stage
@@ -53,7 +53,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-wfengine-engine-activiti-extension-stage
@@ -79,7 +79,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
@@ -92,7 +92,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     mvn-params: '-f wfenginemgrservice/pom.xml'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/wfengine'
     project-name: 'vfc-nfvo-wfengine-wfenginemgrservice'
     branch: 'master'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     mvn-params: '-f activiti-extension/pom.xml'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/wfengine'
     project-name: 'vfc-nfvo-wfengine-activiti-extension'
     branch: 'master'
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/wfengine
     project-name: 'vfc-nfvo-wfengine'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-wfengine-settings'
 
index cc8ba89..a8668dc 100644 (file)
@@ -32,7 +32,7 @@
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: vid-docker-arm64
@@ -48,7 +48,7 @@
 #    mvn-settings: 'vid-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: vid-sonar
@@ -60,7 +60,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: 'vid'
     project-name: 'vid'
     branch: 'master'
@@ -75,7 +75,7 @@
     nexus-iq-namespace: 'onap-'
     project: vid
     project-name: 'vid'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vid-settings'
 
index 33a21d6..69f158c 100644 (file)
@@ -13,7 +13,7 @@
 
     project-type: freestyle
     concurrent: true
-    node: '{build-node}'
+    node: ubuntu1804-docker-8c-8g
 
     properties:
       - infra-properties:
@@ -67,4 +67,4 @@
 
     publishers:
       - infra-shiplogs:
-          maven-version: '{maven-version}'
\ No newline at end of file
+          maven-version: '{maven-version}'
index 8ce93b7..291011c 100644 (file)
@@ -44,7 +44,7 @@
 #      - 'master':
 #          branch: 'master'
 #    mvn-settings: 'vnfsdk-dovetail-integration-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-java-daily':
 #          docker-pom: 'pom.xml'
index d94f8cb..9475435 100644 (file)
@@ -12,7 +12,7 @@
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-f vnfmarket-be/deployment/docker/docker-refrepo/pom.xml -P docker -Dmaven.test.skip=true'
+          mvn-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'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -51,7 +51,7 @@
 #    mvn-settings: 'vnfsdk-refrepo-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: vnfsdk-refrepo-sonar
index d6a48cd..f5e7f43 100644 (file)
@@ -9,6 +9,8 @@
         sign-artifacts: true
         build-node: centos7-builder-4c-4g
         maven-versions-plugin: true
+    - '{project-name}-gerrit-release-jobs':
+        build-node: centos7-docker-8c-8g
     project: 'vnfsdk/validation'
     stream:
       - 'master':
index c746fbd..0a8303c 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: vvp-test-engine
+    name: vvp-test-engine-info
     project-name: 'vvp-test-engine'
     project: 'vvp/test-engine'
     mvn-settings: 'vvp-test-engine-settings'
@@ -8,3 +8,37 @@
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
+
+- project:
+    name: vvp-test-engine-sonar
+    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: 'vvp/test-engine'
+    project-name: 'vvp-test-engine'
+    branch: 'master'
+    mvn-settings: 'vvp-test-engine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vvp-test-engine-verify
+    project-name: 'vvp-test-engine'
+    project: 'vvp/test-engine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vvp-test-engine-settings'
+    build-node: 'centos7-builder-4c-4g'
+    subproject:
+      - 'onap-client':
+          path: 'onap-client'
+          pattern: 'onap-client/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
index 61cc509..3460981 100644 (file)
@@ -14,7 +14,7 @@
 
     - name: Update and upgrade apt packages
       apt:
-        upgrade: yes
+        upgrade: 'yes'
         update_cache: yes
       become: true
       when: ansible_distribution == 'Ubuntu'
       become: true
       when: ansible_distribution == 'Ubuntu'
 
+    - name: Install libssl1.0-dev dep
+      apt:
+        name: libssl1.0-dev
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install nodejs-dev dep for npm
+      apt:
+        name: nodejs-dev
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Install base packages
       apt:
         name:
           - crudini
           - maven
           - python-ncclient
-          - nodejs-dev
-          - node-gyp
+        update_cache: yes
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install npm and addon packages
+      apt:
+        name:
           - nodejs
           - npm
+          - node-gyp
         update_cache: yes
+        state: fixed
       become: true
       when: ansible_distribution == 'Ubuntu'
+
+
index d54746f..0948cd0 100644 (file)
@@ -79,7 +79,7 @@
 
     - name: Update and upgrade apt packages
       apt:
-        upgrade: yes
+        upgrade: 'yes'
         update_cache: yes
       become: true
       when: ansible_distribution == 'Ubuntu'
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install base packages
+    - name: Install nodejs-dev libssl1.0-dev dep
+      apt:
+        name:
+          - libssl1.0-dev
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install nodejs-dev dep for npm
+      apt:
+        name:
+          - nodejs-dev
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install supporting packages
       apt:
         name:
           - unzip
           - crudini
           - maven
           - python-ncclient
-          - nodejs-dev
-          - node-gyp
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install npm and addon packages
+      apt:
+        name:
           - nodejs
           - npm
+          - node-gyp
         update_cache: yes
+        state: fixed
       become: true
       when: ansible_distribution == 'Ubuntu'
 
index 5c45962..b97437b 100644 (file)
         state: started
       become: true
 
-    - name: Install Python 3.6 and packages
+    - name: Install Python 3.6
       yum:
         name:
-          - python36u
-          - python36u-libs
-          - python36u-devel
+          - epel-release
+          - python36
+        update_cache: yes
         state: latest
       become: true
diff --git a/packer/vars/ubuntu-18.04-arm64.json b/packer/vars/ubuntu-18.04-arm64.json
new file mode 100644 (file)
index 0000000..6b8b2b5
--- /dev/null
@@ -0,0 +1,10 @@
+{
+  "arch": "arm64",
+  "base_image": "Ubuntu 18.04 LTS (arm64) [2020-02-18]",
+  "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
+  "distro": "Ubuntu 18.04",
+  "flavor": "lf-standard-1",
+  "source_ami_filter_name": "*ubuntu*18.04*",
+  "source_ami_filter_owner": "099720109477",
+  "ssh_user": "ubuntu"
+}