Merge "Fix docker image build pom.xml path"
diff --git a/global-jjb b/global-jjb
index a2cfbc6..01a96e0 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit a2cfbc66e675655ed0fb7d76862fdc044d96678d
+Subproject commit 01a96e082d0f87e93cfe49157685a70a3e87bd04
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index 88b7dc1..791a9b6 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - redis - - 260980909-9003
+IMAGE_NAME=CentOS 7 - redis - - 70180101-1009
LABELS=centos7-redis-4c-4g
HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
index 8f57b1d..fb013cd 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - - 20190925-211723.485
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm - - 20200124-210936.289
LABELS=ubuntu1604-helm-2c-1g
HARDWARE_ID=v2-highcpu-2
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index fb5c8a7..7b73388 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -64,7 +64,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aaf/authz'
@@ -89,5 +89,6 @@
project-name: aaf-authz
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aaf/authz
branch: master
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 8ce0512..65fb395 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -25,7 +25,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aaf/cadi'
@@ -61,7 +61,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aaf/cadi'
@@ -97,7 +97,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aaf/cadi'
@@ -140,5 +140,6 @@
project-name: aaf-cadi
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aaf/cadi
branch: master
diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
index 8733823..20bf1c8 100644
--- a/jjb/aaf/aaf-luaplugin.yaml
+++ b/jjb/aaf/aaf-luaplugin.yaml
@@ -14,5 +14,6 @@
project-name: aaf-luaplugin
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aaf/luaplugin
branch: master
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index 999fc03..a69daaf 100644
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -31,5 +31,6 @@
project-name: aaf-sms
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aaf/sms
branch: master
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index 31e7006..1178902 100644
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -25,5 +25,6 @@
project-name: aaf-sshsm
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aaf/sshsm
branch: master
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index ff9c5f8..a21f0c9 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -37,7 +37,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/aai-common'
@@ -67,6 +67,7 @@
project-name: aai-aai-common
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/aai-common
branch: master
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 1b9fd76..9f3efcd 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -41,7 +41,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/babel'
@@ -70,5 +70,6 @@
project-name: aai-babel
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/babel
branch: master
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index 5995634..a578d49 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -36,7 +36,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/cacher'
@@ -66,5 +66,6 @@
project-name: aai-cacher
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/cacher
branch: master
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 8f5ff60..ee20e92 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -40,7 +40,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/data-router'
@@ -67,5 +67,6 @@
project-name: aai-data-router
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/data-router
branch: master
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index c32692d..ef1a858 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -52,5 +52,6 @@
project-name: aai-esr-gui
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/esr-gui
branch: master
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 016c804..952eebe 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -43,7 +43,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/esr-server'
@@ -70,5 +70,6 @@
project-name: aai-esr-server
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/esr-server
branch: master
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index db026cf..327eced 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -35,7 +35,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/event-client'
@@ -62,5 +62,6 @@
project-name: aai-event-client
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/event-client
branch: master
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 2accf99..0fb84cd 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/graphadmin'
@@ -71,5 +71,6 @@
project-name: aai-graphadmin
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/graphadmin
branch: master
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 67b3b94..68f6940 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -37,6 +37,7 @@
project-name: aai-graphgraph
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/graphgraph
branch: master
@@ -48,7 +49,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/graphgraph'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 22a6628..1c0dc70 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -35,7 +35,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/logging-service'
@@ -62,5 +62,6 @@
project-name: aai-logging-service
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/logging-service
branch: master
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index e6eca29..25f4782 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -41,7 +41,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/model-loader'
@@ -68,6 +68,7 @@
project-name: aai-model-loader
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/model-loader
branch: master
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 9dac98e..0aa2168 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/resources'
@@ -71,6 +71,7 @@
project-name: aai-resources
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/resources
branch: master
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index b7ee329..ffe1633 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -35,7 +35,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/rest-client'
@@ -62,5 +62,6 @@
project-name: aai-rest-client
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/rest-client
branch: master
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index e4eaab9..9cb614e 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -35,7 +35,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/router-core'
@@ -62,5 +62,6 @@
project-name: aai-router-core
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/router-core
branch: master
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 0361dbb..9351c85 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/schema-service'
@@ -71,5 +71,6 @@
project-name: aai-schema-service
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/schema-service
branch: master
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index b8d3353..a780e9c 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -59,7 +59,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/search-data-service'
@@ -86,6 +86,7 @@
project-name: aai-search-data-service
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/search-data-service
branch: master
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 1408733..c27ea71 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -40,7 +40,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/sparky-be'
@@ -67,6 +67,7 @@
project-name: aai-sparky-be
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/sparky-be
branch: master
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 9283edf..63596ee 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -26,6 +26,7 @@
project-name: aai-sparky-fe
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/sparky-fe
branch: master
@@ -37,7 +38,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/sparky-fe'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index cd58d6a..e359715 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/traversal'
@@ -71,5 +71,6 @@
project-name: aai-traversal
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/traversal
branch: master
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index db0ec41..a755f5e 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -41,7 +41,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aai/validation'
@@ -69,5 +69,6 @@
project-name: aai-validation
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: aai/validation
branch: master
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index ffd1a87..9a2c190 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -16,8 +16,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'appc-cdt-settings'
files: '**'
archive-artifacts: ''
@@ -39,5 +37,6 @@
project-name: appc-cdt
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: appc/cdt
branch: master
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index e16c110..a4ef267 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -11,8 +11,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
@@ -29,14 +27,18 @@
mvn-params: '-Dmaven.test.skip=true'
- 'docker-version-java-daily':
mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ mvn-params: '-Dmaven.test.skip=true -P docker'
+ maven-versions-plugin: true
+ mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+ java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'appc/deployment'
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
@@ -69,5 +71,6 @@
project-name: appc-deployment
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: appc/deployment
branch: master
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 1730afd..dd7353f 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -15,15 +15,17 @@
sign-artifacts: true
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
+ mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+ java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
+ mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+ java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
project: 'appc'
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'appc-settings'
maven-version: "mvn35"
files: '**'
@@ -38,7 +40,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-8c-8g
project: 'appc'
@@ -69,5 +71,6 @@
project-name: appc
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: appc
branch: master
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index b8f6d88..897028c 100644
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -22,8 +22,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'appc-parent-settings'
maven-version: "mvn35"
build-node: ubuntu1604-builder-2c-1g
@@ -33,5 +31,6 @@
project-name: appc-parent
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: appc/parent
branch: master
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index c69c670..7e31d9a 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -22,6 +22,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -52,7 +53,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/apps'
@@ -99,6 +100,7 @@
project-name: ccsdk-apps
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/apps
branch: master
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 4104859..d237148 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -18,7 +18,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -49,7 +49,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/cds'
@@ -80,6 +80,7 @@
project-name: ccsdk-cds
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/cds
branch: master
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 727b6ee..8b01af9 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -38,7 +38,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: centos7-redis-4c-4g
project: 'ccsdk/dashboard'
@@ -66,6 +66,7 @@
project-name: ccsdk-dashboard
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/dashboard
branch: master
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index aea76c6..015e0a1 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -18,7 +18,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'ccsdk/distribution'
@@ -76,6 +76,7 @@
project-name: ccsdk-distribution
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/distribution
branch: master
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 90837d7..37f13ef 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -43,7 +43,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/features'
@@ -73,6 +73,7 @@
project-name: ccsdk-features
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/features
branch: master
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index cd04db7..a6ff815 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -53,6 +53,7 @@
project-name: ccsdk-parent
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/parent
branch: master
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 3dcb729..9ee1504 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -39,7 +39,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: centos7-redis-4c-4g
project: 'ccsdk/platform/plugins'
@@ -68,6 +68,7 @@
project-name: ccsdk-platform-plugins
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/platform/plugins
branch: master
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 3430516..7e83f00 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/adaptors'
@@ -73,6 +73,7 @@
project-name: ccsdk-sli-adaptors
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/sli/adaptors
branch: master
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 868151a..73d5b0b 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/core'
@@ -73,6 +73,7 @@
project-name: ccsdk-sli-core
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/sli/core
branch: master
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 73ea823..cbd12c4 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/northbound'
@@ -73,6 +73,7 @@
project-name: ccsdk-sli-northbound
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/sli/northbound
branch: master
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 71ce51b..0997bff 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/plugins'
@@ -72,6 +72,7 @@
project-name: ccsdk-sli-plugins
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/sli/plugins
branch: master
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 7b49b60..3486a30 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -46,6 +46,7 @@
project-name: ccsdk-utils
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: ccsdk/utils
branch: master
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index b3dae54..79a39f6 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -48,7 +48,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-docker-8c-8g
project: 'clamp'
@@ -78,5 +78,6 @@
project-name: clamp
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: clamp
branch: master
diff --git a/jjb/clamp/dashboard/info-clamp-dashboard.yaml b/jjb/clamp/dashboard/info-clamp-dashboard.yaml
index 273b341..efff6fc 100644
--- a/jjb/clamp/dashboard/info-clamp-dashboard.yaml
+++ b/jjb/clamp/dashboard/info-clamp-dashboard.yaml
@@ -4,5 +4,6 @@
project-name: clamp-dashboard
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: clamp/dashboard
branch: master
diff --git a/jjb/clamp/ui/info-clamp-ui.yaml b/jjb/clamp/ui/info-clamp-ui.yaml
index 64fa743..c532356 100644
--- a/jjb/clamp/ui/info-clamp-ui.yaml
+++ b/jjb/clamp/ui/info-clamp-ui.yaml
@@ -4,5 +4,6 @@
project-name: clamp-ui
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: clamp/ui
branch: master
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 25b06a8..c21ae21 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -64,7 +64,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'cli'
@@ -90,5 +90,6 @@
project-name: cli
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: cli
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
index c98abc9..9d76d41 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
@@ -4,5 +4,6 @@
project-name: dcaegen2-analytics-flink
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/analytics/flink
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
index f5d60d8..7dba3af 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
@@ -48,5 +48,6 @@
project-name: dcaegen2-analytics-pnda
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/analytics/pnda
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 2a4ef29..c3b7ed1 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -55,5 +55,6 @@
project-name: dcaegen2-analytics-tca-gen2
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/analytics/tca-gen2
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index 1ba7b15..21f605f 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -57,5 +57,6 @@
project-name: dcaegen2-analytics-tca
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/analytics/tca
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
index 452bd56..80ac689 100644
--- a/jjb/dcaegen2/dcaegen2-analytics.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@ -4,5 +4,6 @@
project-name: dcaegen2-analytics
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/analytics
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index ad771b7..89eb6b6 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -62,5 +62,6 @@
project-name: dcaegen2-collectors-datafile
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/collectors/datafile
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index e2d6300..ab4e9f5 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,6 +6,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
- 'elalto':
branch: 'elalto'
# apply to all jobs
@@ -36,6 +37,7 @@
- project:
name: dcaegen2-collectors-hv-ves-clm
+ java-version: openjdk11
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
@@ -45,10 +47,12 @@
build-node: ubuntu1604-docker-8c-8g
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
+
- project:
name: dcaegen2-collectors-hv-ves-info
project-name: dcaegen2-collectors-hv-ves
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/collectors/hv-ves
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 189de7a..90f26ef 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -60,5 +60,6 @@
project-name: dcaegen2-collectors-restconf
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/collectors/restconf
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 0ef35e6..02be8dd 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -50,5 +50,6 @@
project-name: dcaegen2-collectors-snmptrap
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/collectors/snmptrap
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index fc12da4..d507433 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -34,6 +34,7 @@
- project:
name: dcaegen2-collectors-ves-sonar
+ java-version: openjdk11
jobs:
- gerrit-maven-sonar
cron: '@daily'
@@ -61,5 +62,6 @@
project-name: dcaegen2-collectors-ves
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/collectors/ves
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
index 35e2592..b695e9e 100644
--- a/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -4,5 +4,6 @@
project-name: dcaegen2-collectors
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/collectors
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index cb0f944..b707826 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -6,7 +6,8 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
-
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/deployments'
stream:
- 'master':
@@ -40,5 +41,6 @@
project-name: dcaegen2-deployments
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/deployments
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml
deleted file mode 100644
index a203a75..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- dcaegen2_platform_common: &dcaegen2_platform_common
- # values apply to all dcaegen2_platform docker projects
- name: dcaegen2-platform-docker-common
- # git repo
- project: dcaegen2/platform
- # maven settings file has docker credentials
- mvn-settings: dcaegen2-platform-settings
- # use host network to clone from our gerrit
- docker-build-args: '--network=host'
- # source of docker tag
- # container-tag-method: yaml-file
- # until everything needed for yaml-file is in place
- container-tag-method: latest
- build-node: ubuntu1604-docker-8c-8g
- # jenkins job name prefix
- project-name: '{name}'
- tox-dir: '{docker-root}'
- # build only on relevant changes
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: '{docker-root}/.*'
-
-- project:
- name: dcaegen2-platform-aoadapter-project-view
- project-name: dcaegen2-platform-aoadapter
- views:
- - project-view
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-aoadapter
- # root of docker build
- docker-root: adapter/acumos
- # tag override
- docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
- # image name
- docker-name: 'onap/{name}'
- stream:
- - master:
- branch: master
- jobs:
- - '{project-name}-gerrit-docker-jobs'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcagen2-platform-aoadapter-verify
- docker-root: adapter/acumos
- stream:
- - all:
- branch: '*'
- jobs:
- - gerrit-tox-verify
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-aoadapter-sonar
- docker-root: adapter/acumos
- branch: master
- jobs:
- - gerrit-tox-sonar
- cron: '@daily'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-aoadapter-clm
- docker-root: adapter/acumos
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project-name: 'dcaegen2-platform-aoadapter-clm'
- mvn-params: '-f adapter/acumos/pom.xml'
- branch: 'master'
-
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 2f50063..c00ded6 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -39,5 +39,6 @@
project-name: dcaegen2-platform-blueprints
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/platform/blueprints
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
deleted file mode 100644
index 22a68a2..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
- name: dcaegen2-platform-cli-bp-gen
- project: 'dcaegen2/platform/cli'
- project-name: 'dcaegen2-platform-cli'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- version-properties-file: 'blueprint-generator/version.properties'
- mvn-pom: 'blueprint-generator/pom.xml'
- mvn-params: '-f blueprint-generator/pom.xml'
- pattern: 'blueprint-generator/**'
- subproject:
- - 'blueprint-gen':
- pom: 'blueprint-generator/pom.xml'
- pattern: 'blueprint-generator/**'
- stream:
- - 'master':
- branch: 'master'
- - 'elalto':
- branch: 'elalto'
- mvn-settings: 'dcaegen2-platform-cli-settings'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
deleted file mode 100644
index 613ef12..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-- project:
- name: dcaegen2-platform-cli
- project-name: 'dcaegen2-platform-cli'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'dcaegen2/platform/cli'
- stream:
- - 'master':
- branch: 'master'
- - 'elalto':
- branch: 'elalto'
- mvn-settings: 'dcaegen2-platform-cli-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
- name: dcaegen2-platform-cli-sonar
- jobs:
- - gerrit-maven-sonar
- cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
- project: 'dcaegen2/platform/cli'
- project-name: 'dcaegen2-platform-cli'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-cli-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: dcaegen2-platform-cli-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: dcaegen2/platform/cli
- build-node: ubuntu1604-docker-8c-8g
- project-name: 'dcaegen2-platform-cli'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-cli-settings'
-
-- project:
- name: dcaegen2-platform-cli-info
- project-name: dcaegen2-platform-cli
- jobs:
- - gerrit-info-yaml-verify
- project: dcaegen2/platform/cli
- branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 7b89b1a..670b71d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -52,3 +52,4 @@
branch: master
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 3851bb6..68d4f96 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -6,7 +6,8 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
-
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/platform/deployment-handler'
stream:
- 'master':
@@ -39,5 +40,6 @@
project-name: dcaegen2-platform-deployment-handler
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/platform/deployment-handler
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
new file mode 100644
index 0000000..911435c
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -0,0 +1,90 @@
+---
+- job-group:
+ # This job group contains all the jobs that should be deployed for
+ # a subproject of dcaegen2/platform that builds a Docker image from
+ # Python code.
+ #
+ # Required parameters:
+ # build-node: The node to run build on.
+ # mvn-settings: Maven settings.xml file containing credentials to use.
+ # project-name: The job name prefix
+ # src-dir: The subdirectory of the repository containing subproject code
+ # stream: The stream to build
+ # branch: The branch to build
+ #
+ # Note: Multiple subprojects can be built with a single JJB project
+ # by specifying the value of project-name as a list.
+ # Similarly, multiple streams can be built with a single JJB project
+ # by specifying the value of the stream as a list.
+ # For example:
+ # project-name:
+ # - subproject-name1:
+ # src-dir: subproject-dir1
+ # - subproject-name2:
+ # src-dir: subproject-dir2
+ # - subproject-name3:
+ # src-dir: subproject-dir3
+ # stream:
+ # - master:
+ # branch: master
+ # - release1:
+ # branch: release1.0
+ # jobs:
+ # - dcaegen2-docker-python-jobs
+
+ name: '{project-name}-dcaegen2-docker-python-jobs'
+ id: dcaegen2-docker-python-jobs
+ container-tag-method: latest
+ docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
+ nexus-iq-namespace: 'onap-'
+ tox-dir: '{src-dir}'
+ docker-root: '{src-dir}'
+ docker-name: 'onap/{project-name}'
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: '{src-dir}/.*'
+ jobs:
+ - gerrit-tox-verify:
+ stream: all
+ branch: '*'
+ - gerrit-docker-verify
+ - gerrit-docker-merge
+ - gerrit-maven-clm:
+ mvn-params: '-f {src-dir}'
+ stream: master
+ branch: master
+ - gerrit-tox-sonar:
+ # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
+ sonar-mvn-goal: '-f {src-dir} sonar:sonar'
+ cron: '@daily'
+ stream: master
+ branch: master
+ - gerrit-release-verify
+ - gerrit-release-merge
+
+- project:
+ name: dcaegen2-platform-docker-python-subprojects
+ project: dcaegen2/platform
+ mvn-settings: dcaegen2-platform-settings
+ build-node: ubuntu1604-docker-8c-8g
+ project-name:
+ - dcaegen2-platform-aoadapter:
+ src-dir: adapter/acumos
+ - dcaegen2-platform-mod-distributorapi:
+ src-dir: mod/distributorapi
+ - dcaegen2-platform-mod-onboardingapi:
+ src-dir: mod/onboardingapi
+ - dcaegen2-platform-oti-event-handler:
+ src-dir: oti/event-handler
+ stream:
+ - master:
+ branch: master
+ views:
+ - project-view:
+ project-name: dcaegen2-platform-aoadapter
+ - project-view:
+ project-name: dcaegen2-platform-mod
+ - project-view:
+ project-name: dcaegen2-platform-oti
+ jobs:
+ - dcaegen2-docker-python-jobs
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 9b3a387..f1a67cd 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -62,5 +62,6 @@
project-name: dcaegen2-platform-inventory-api
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/platform/inventory-api
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
new file mode 100644
index 0000000..859badc
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -0,0 +1,31 @@
+---
+- project:
+ name: dcaegen2-platform-mod-bpgenerator
+ project: 'dcaegen2/platform'
+ project-name: 'dcaegen2-platform-mod'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ version-properties-file: 'mod/bpgenerator/version.properties'
+ mvn-pom: 'mod/bpgenerator/pom.xml'
+ mvn-params: '-f mod/bpgenerator/pom.xml'
+ pattern: 'mod/bpgenerator/**'
+ subproject:
+ - 'bpgenerator':
+ pom: 'mod/bpgenerator/pom.xml'
+ pattern: 'mod/bpgenerator/**'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dcaegen2-platform-settings'
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
new file mode 100644
index 0000000..2402dd0
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+ name: dcaegen2-platform-mod-designtool
+ project-name: dcaegen2-platform-mod
+ # git repo
+ project: dcaegen2/platform
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java':
+ mvn-goals: 'clean install'
+ subproject:
+ - designtool:
+ pom: 'mod/designtool/pom.xml'
+ pattern: 'mod/designtool/**'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: dcaegen2-platform-settings
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-8c-8g
+
+
+- project:
+ name: dcaegen2-platform-mod-designtool-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: dcaegen2/platform
+ build-node: ubuntu1604-docker-8c-8g
+ project-name: 'dcaegen2-platform-mod-designtool'
+ branch: 'master'
+ mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml
deleted file mode 100644
index 1210edb..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-mod-distributorapi
- # root of docker build
- docker-root: mod/distributorapi
- # image name
- docker-name: '{name}'
- stream:
- - master:
- branch: master
- jobs:
- - '{project-name}-gerrit-docker-jobs'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcagen2-platform-mod-distributorapi-verify
- docker-root: mod/distributorapi
- stream:
- - all:
- branch: '*'
- jobs:
- - gerrit-tox-verify
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-mod-distributorapi-sonar
- docker-root: mod/distributorapi
- branch: master
- jobs:
- - gerrit-tox-sonar
- cron: '@daily'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-mod-distributorapi-clm
- docker-root: mod/distributorapi
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project-name: 'dcaegen2-platform-mod-distributorapi-clm'
- mvn-params: '-f mod/distributorapi/pom.xml'
- branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index e476fbf..f7a8bac 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -21,6 +21,20 @@
build-node: ubuntu1604-docker-8c-8g
- project:
+ name: dcaegen2-platform-mod-genprocessor-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: '@daily'
+ build-node: ubuntu1604-docker-8c-8g
+ project: 'dcaegen2/platform'
+ project-name: 'dcaegen2-platform-mod-genprocessor'
+ branch: 'master'
+ mvn-settings: 'dcaegen2-platform-settings'
+ mvn-params: '-f mod/genprocessor/pom.xml'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
name: dcaegen2-platform-mod-genprocessor-clm
jobs:
- gerrit-maven-clm
@@ -31,3 +45,4 @@
mvn-params: '-f mod/genprocessor/pom.xml'
branch: 'master'
mvn-settings: 'dcaegen2-platform-settings'
+
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml
deleted file mode 100644
index ca63a42..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-mod-onboardingapi
- # root of docker build
- docker-root: mod/onboardingapi
- # image name
- docker-name: '{name}'
- stream:
- - master:
- branch: master
- jobs:
- - '{project-name}-gerrit-docker-jobs'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcagen2-platform-mod-onboardingapi-verify
- docker-root: mod/onboardingapi
- stream:
- - all:
- branch: '*'
- jobs:
- - gerrit-tox-verify
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-mod-onboardingapi-sonar
- docker-root: mod/onboardingapi
- branch: master
- jobs:
- - gerrit-tox-sonar
- cron: '@daily'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-mod-onboardingapi-clm
- docker-root: mod/onboardingapi
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project-name: 'dcaegen2-platform-mod-onboardingapi-clm'
- mvn-params: '-f mod/onboardingapi/pom.xml'
- branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index bd7679c..368e5c5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -21,6 +21,20 @@
build-node: ubuntu1604-docker-8c-8g
- project:
+ name: dcaegen2-platform-mod-runtimeapi-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: '@daily'
+ build-node: ubuntu1604-docker-8c-8g
+ project: 'dcaegen2/platform'
+ project-name: 'dcaegen2-platform-mod-runtimeapi'
+ branch: 'master'
+ mvn-settings: 'dcaegen2-platform-settings'
+ mvn-params: '-f mod/runtimeapi/pom.xml'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
name: dcaegen2-platform-mod-runtimeapi-clm
jobs:
- gerrit-maven-clm
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod.yaml b/jjb/dcaegen2/dcaegen2-platform-mod.yaml
deleted file mode 100644
index 1baf6c0..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-
-- project:
- name: dcaegen2-platform-mod-project-view
- project-name: dcaegen2-platform-mod
- views:
- - project-view
-
diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml
deleted file mode 100644
index fa64115..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-oti-event-handler
- # root of docker build
- docker-root: oti/event-handler
- # image name
- docker-name: '{name}'
- stream:
- - master:
- branch: master
- jobs:
- - '{project-name}-gerrit-docker-jobs'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcagen2-platform-oti-event-handler-verify
- docker-root: oti/event-handler
- stream:
- - all:
- branch: '*'
- jobs:
- - gerrit-tox-verify
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-oti-event-handler-sonar
- docker-root: oti/event-handler
- branch: master
- jobs:
- - gerrit-tox-sonar
- cron: '@daily'
-
-- project:
- <<: *dcaegen2_platform_common
- name: dcaegen2-platform-oti-event-handler-clm
- docker-root: oti/event-handler
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project-name: 'dcaegen2-platform-oti-event-handler-clm'
- mvn-params: '-f oti/event-handler/pom.xml'
- branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
index d295171..b4c5864 100644
--- a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
@@ -56,7 +56,7 @@
jobs:
- gerrit-maven-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1604-docker-8c-8g
project: 'dcaegen2/platform'
project-name: 'dcaegen2-platform-oti-event-proc'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index ce9fb46..5d57fd1 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -52,5 +52,6 @@
project-name: dcaegen2-platform-plugins
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/platform/plugins
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index a93fd57..7ceef5e 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -6,7 +6,8 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
-
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/platform/policy-handler'
stream:
- 'master':
@@ -50,5 +51,6 @@
project-name: dcaegen2-platform-policy-handler
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/platform/policy-handler
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 2f0ec21..81c9b13 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -50,5 +50,6 @@
project-name: dcaegen2-platform-servicechange-handler
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/platform/servicechange-handler
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
index a07253a..fa8af0d 100644
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -4,5 +4,6 @@
project-name: dcaegen2-platform
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/platform
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index ff7f9ae..b8ff328 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -50,5 +50,6 @@
project-name: dcaegen2-services-heartbeat
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/services/heartbeat
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index d2774a1..e82cf47 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -59,5 +59,6 @@
project-name: dcaegen2-services-mapper
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/services/mapper
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index dc6eac1..0bde5de 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -62,5 +62,6 @@
project-name: dcaegen2-services-pm-mapper
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/services/pm-mapper
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index cb9130f..4073a9f 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -20,6 +20,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
- 'elalto':
branch: 'elalto'
mvn-settings: 'dcaegen2-services-prh-settings'
@@ -35,6 +36,7 @@
- gerrit-maven-sonar
cron: '@daily'
build-node: ubuntu1604-docker-8c-8g
+ java-version: openjdk11
project: 'dcaegen2/services/prh'
project-name: 'dcaegen2-services-prh'
branch: 'master'
@@ -49,6 +51,7 @@
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/prh
build-node: ubuntu1604-docker-8c-8g
+ java-version: openjdk11
project-name: 'dcaegen2-services-prh'
branch: 'master'
mvn-settings: 'dcaegen2-services-prh-settings'
@@ -58,5 +61,6 @@
project-name: dcaegen2-services-prh
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/services/prh
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 5d3e2e2..5cbb321 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -16,6 +16,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
- 'elalto':
branch: 'elalto'
mvn-settings: 'dcaegen2-services-sdk-settings'
@@ -27,6 +28,7 @@
- project:
name: dcaegen2-services-sdk-integration-pairwise
+ java-version: openjdk11
jobs:
- '{project-name}-{stream}-integration-pairwise':
build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
@@ -41,6 +43,7 @@
- project:
name: dcaegen2-services-sdk-sonar
+ java-version: openjdk11
jobs:
- gerrit-maven-sonar
cron: '@daily'
@@ -54,6 +57,7 @@
- project:
name: dcaegen2-services-sdk-clm
+ java-version: openjdk11
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
@@ -68,5 +72,6 @@
project-name: dcaegen2-services-sdk
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/services/sdk
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 0f8dc19..99055a7 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -59,5 +59,6 @@
project-name: dcaegen2-services-son-handler
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/services/son-handler
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml
index 3b5179e..81bcd8a 100644
--- a/jjb/dcaegen2/dcaegen2-services.yaml
+++ b/jjb/dcaegen2/dcaegen2-services.yaml
@@ -4,5 +4,6 @@
project-name: dcaegen2-services
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/services
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 666b217..84fe787 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -52,6 +52,7 @@
project-name: dcaegen2-utils
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2/utils
branch: master
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index c0c19f1..dd0b0cc 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -43,5 +43,6 @@
project-name: dcaegen2
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dcaegen2
branch: master
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index fffa81d..5c4028e 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -36,7 +36,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'demo'
@@ -51,5 +51,6 @@
project-name: demo
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: demo
branch: master
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 57f4a1a..d24124f 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -16,6 +16,8 @@
mvn-goals: 'clean package -P docker docker:build docker:push'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dmaap/buscontroller'
stream:
@@ -44,5 +46,6 @@
project-name: dmaap-buscontroller
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/buscontroller
branch: master
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 3905b02..8fbd19f 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -50,5 +50,6 @@
project-name: dmaap-datarouter
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/datarouter
branch: master
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 94cc44b..f9785b9 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -56,5 +56,6 @@
project-name: dmaap-dbcapi
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/dbcapi
branch: master
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
index c131b89..e610e47 100644
--- a/jjb/dmaap/dmaap-kafka-docker.yaml
+++ b/jjb/dmaap/dmaap-kafka-docker.yaml
@@ -26,5 +26,6 @@
project-name: dmaap-kafka-docker
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/kafka11aaf
branch: master
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
index 7b1573c..bc42004 100644
--- a/jjb/dmaap/dmaap-kafka.yaml
+++ b/jjb/dmaap/dmaap-kafka.yaml
@@ -29,5 +29,6 @@
project-name: dmaap-kafka
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/kafka11aaf
branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 3bad3bc..9c932b4 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -47,5 +47,6 @@
project-name: dmaap-messagerouter-dmaapclient
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/messagerouter/dmaapclient
branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index d55e92b..21a8ba5 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -10,6 +10,8 @@
maven-versions-plugin: 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: 'dmaap/messagerouter/messageservice'
stream:
- 'master':
@@ -37,5 +39,6 @@
project-name: dmaap-messagerouter-docker
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/messagerouter/messageservice
branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index c64a9b5..aef8067 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -46,5 +46,6 @@
project-name: dmaap-messagerouter-messageservice
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/messagerouter/messageservice
branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 6e297e8..09633d9 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -48,5 +48,6 @@
project-name: dmaap-messagerouter-mirroragent
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/messagerouter/mirroragent
branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 8eff9f6..9127fca 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -48,5 +48,6 @@
project-name: dmaap-messagerouter-msgrtr
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/messagerouter/msgrtr
branch: master
diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml
index 0b275f4..3b18d08 100644
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-zookeeper.yaml
@@ -36,5 +36,6 @@
project-name: dmaap-zookeeper
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: dmaap/zookeeper
branch: master
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index c91b6c4..f03cce0 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -36,5 +36,6 @@
project-name: doc
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: doc
branch: master
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 47fcf39..ebf695c 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -62,6 +62,7 @@
- 'master':
branch: 'master'
mvn-settings: 'externalapi-nbi-settings'
+ java-version: openjdk11
- project:
name: externalapi-nbi-sonar
@@ -71,7 +72,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'externalapi/nbi'
@@ -80,11 +81,13 @@
mvn-settings: 'externalapi-nbi-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: externalapi-nbi-info
project-name: externalapi-nbi
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: externalapi/nbi
branch: master
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 7698bf5..1590d01 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -56,6 +56,7 @@
# SonarCloud
sonarcloud_project_organization: onap
sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff
+ sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
# Nexus3 docker registries
container-public-registry: nexus3.onap.org:10001
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 4e7908e..d950825 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -55,5 +55,6 @@
project-name: holmes-common
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: holmes/common
branch: master
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 4e6ca57..0788584 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -53,5 +53,6 @@
project-name: holmes-engine-management
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: holmes/engine-management
branch: master
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 4735bd2..5f1bae2 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -53,5 +53,6 @@
project-name: holmes-rule-management
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: holmes/rule-management
branch: master
diff --git a/jjb/integration/docker/info-integration-docker.yaml b/jjb/integration/docker/info-integration-docker.yaml
new file mode 100644
index 0000000..071f816
--- /dev/null
+++ b/jjb/integration/docker/info-integration-docker.yaml
@@ -0,0 +1,9 @@
+---
+- project:
+ name: integration-docker-onap-java11-info
+ project-name: integration-docker-onap-java11
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/docker/onap-java11
+ branch: master
diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index 5a0eedd..38c848d 100644
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -15,3 +15,12 @@
- 'vCPE':
trigger_jobs:
robot-options: ''
+
+- project:
+ name: integration-csit-info
+ project-name: integration-csit
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/csit
+ branch: master
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 10b713e..b7b92fd 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -7,6 +7,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -43,6 +44,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -66,6 +69,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -102,6 +106,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -125,6 +131,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -165,6 +172,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -206,6 +215,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -246,6 +256,8 @@
files: '**/{project-name}/**'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -287,6 +299,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -326,6 +339,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -349,6 +364,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -388,6 +404,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -411,6 +429,7 @@
build-node: 'ubuntu1604-docker-8c-8g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -454,6 +473,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@ -495,6 +516,7 @@
build-node: 'ubuntu1604-docker-arm64-4c-2g'
node: '{build-node}'
recipients: ''
+ java-version: 'openjdk11'
properties:
- lf-infra-properties:
@@ -538,6 +560,8 @@
jobs: '{obj:trigger_jobs}'
builders:
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 401eecf..de18753 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -10,5 +10,6 @@
project-name: integration
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: integration
branch: master
diff --git a/jjb/integration/xtesting/info-integration-xtesting.yaml b/jjb/integration/xtesting/info-integration-xtesting.yaml
index 3f45e1d..babd9f6 100644
--- a/jjb/integration/xtesting/info-integration-xtesting.yaml
+++ b/jjb/integration/xtesting/info-integration-xtesting.yaml
@@ -4,5 +4,6 @@
project-name: integration-xtesting
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: integration/xtesting
branch: master
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
new file mode 100644
index 0000000..ca2ea85
--- /dev/null
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -0,0 +1,68 @@
+---
+- builder:
+ name: lf-onap-releasedockerhub-macro
+ builders:
+ - shell: !include-raw-escape:
+ - ../shell/run_releasedockerhub.sh
+ ##- ../shell/run_releasedockerhub.sh "{org} {summary} {verbose} {copy}"
+
+
+- job:
+ name: lf-onap-release-docker-hub
+ build-timeout: 90
+
+ project-type: freestyle
+ node: ubuntu1604-docker-8c-8g ## Probably don't need this much
+ disable-job: false
+ disabled: '{disable-job}'
+
+ # Runs once a week
+ triggers:
+ - timed: '@weekly'
+
+# Define needed parameters for lf-infra-docker-login
+ parameters:
+ - string:
+ name: DOCKER_REGISTRY
+ default: 'nexus3.onap.org'
+ - string:
+ name: REGISTRY_PORTS
+ default: '10002'
+ - string:
+ name: DOCKERHUB_REGISTRY
+ default: 'docker.io'
+
+# Define needed parameters for lf-onap-releasedockerhub-macro
+ - string:
+ name: RELEASEDOCKERHUB_ORG
+ default: 'onap'
+ description: ''
+ - string:
+ name: RELEASEDOCKERHUB_REPO
+ default: ''
+ description: 'Only match repos that contains this string'
+ - string:
+ name: RELEASEDOCKERHUB_EXACT
+ default: ''
+ description: 'Repo has to exactly match RELEASEDOCKERHUB_REPO '
+ - string:
+ name: RELEASEDOCKERHUB_SUMMARY
+ default: 'Yes'
+ description: 'Provides a brief statistic summary of what it found, and what it should do. Activate with Yes'
+ - string:
+ name: RELEASEDOCKERHUB_VERBOSE
+ default: ''
+ description: 'Provides a verbose output of the operations. Activate with Yes'
+ - string:
+ name: RELEASEDOCKERHUB_COPY
+ default: 'Yes'
+ description: 'If a copy operation should be done from Nexus3 to docker hub. Activate with Yes'
+
+
+ builders:
+ - lf-infra-pre-build ## shell/python-tools-install.sh
+ - lf-infra-docker-login:
+ global-settings-file: 'global-settings'
+ settings-file: 'onap-releasedockerhub-authz-settings'
+ - lf-onap-releasedockerhub-macro:
+
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 4069552..8c19c2a 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -65,6 +65,7 @@
project-name: 'logging-analytics-pomba-pomba-aai-context-builder'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'logging-analytics/pomba/pomba-aai-context-builder'
branch: 'master'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
index f8d94e7..ac73c5c 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -37,6 +37,7 @@
project-name: 'logging-analytics-pomba-pomba-audit-common'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'logging-analytics/pomba/pomba-audit-common'
branch: 'master'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 938d5f9..6735358 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -45,6 +45,7 @@
project-name: 'logging-analytics-pomba-pomba-context-aggregator'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'logging-analytics/pomba/pomba-context-aggregator'
branch: 'master'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index 8c077fa..56bd157 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -65,6 +65,7 @@
project-name: 'logging-analytics-pomba-pomba-network-discovery-context-builder'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'logging-analytics/pomba/pomba-network-discovery-context-builder'
branch: 'master'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index 21491c3..ddc3ac9 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@ -63,6 +63,7 @@
project-name: 'logging-analytics-pomba-pomba-sdc-context-builder'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'logging-analytics/pomba/pomba-sdc-context-builder'
branch: 'master'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index 3765a33..e3fce2a 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -60,6 +60,7 @@
project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
branch: 'master'
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 08cf976..9ff1348 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -110,6 +110,7 @@
project-name: 'logging-analytics'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'logging-analytics'
branch: 'master'
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 2c04e23..0d8e74d 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -59,5 +59,6 @@
project-name: modeling-etsicatalog
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: modeling/etsicatalog
branch: master
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 6a51fc5..cc07972 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -58,7 +58,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'msb/apigateway'
@@ -83,5 +83,6 @@
project-name: msb-apigateway
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: msb/apigateway
branch: master
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 149238e..67eca0a 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -51,7 +51,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'msb/discovery'
@@ -76,5 +76,6 @@
project-name: msb-discovery
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: msb/discovery
branch: master
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 579f463..9e37e17 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -26,7 +26,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'msb/java-sdk'
@@ -51,5 +51,6 @@
project-name: msb-java-sdk
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: msb/java-sdk
branch: master
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 09426a2..2f0c3e9 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -26,7 +26,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'msb/swagger-sdk'
@@ -51,5 +51,6 @@
project-name: msb-swagger-sdk
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: msb/swagger-sdk
branch: master
diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index 8d8b72e..472325a 100755
--- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -10,9 +10,11 @@
chmod 755 ./starlingx/docker/*.*
#chmod 755 ./lenovo/docker/*.*
chmod 755 ./fcaps/docker/*.*
+chmod 755 ./hpa/docker/*.*
./windriver/docker/build_image.sh
./pike/docker/build_image.sh
./starlingx/docker/build_image.sh
#./lenovo/docker/build_image.sh
./fcaps/docker/build_image.sh
+./hpa/docker/build_image.sh
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index b8bf8a1..270a557 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -61,7 +61,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/azure'
@@ -86,5 +86,6 @@
project-name: multicloud-azure
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: multicloud/azure
branch: master
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index d5e24d2..1883da9 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -66,7 +66,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/framework'
@@ -96,7 +96,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/framework'
diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml
index 859637e..cec2f67 100644
--- a/jjb/multicloud/multicloud-framework.yaml
+++ b/jjb/multicloud/multicloud-framework.yaml
@@ -3,5 +3,6 @@
project-name: multicloud-framework
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: multicloud/framework
branch: master
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index e9f18ed..f8cf56f 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -55,5 +55,6 @@
project-name: multicloud-k8s
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: multicloud/k8s
branch: master
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 205d374..ba897bc 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -63,7 +63,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack/vmware'
@@ -89,5 +89,6 @@
project-name: multicloud-openstack-vmware
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: multicloud/openstack/vmware
branch: master
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index eefdc77..f588024 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -52,6 +52,10 @@
# path: 'lenovo'
# pattern: 'share/**'
# pom: 'lenovo/pom.xml'
+ - 'hpa':
+ path: 'hpa'
+ pattern: 'hpa/**'
+ pom: 'hpa/pom.xml'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
@@ -100,7 +104,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack'
@@ -119,7 +123,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack'
@@ -138,7 +142,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack'
@@ -168,7 +172,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack'
@@ -187,7 +191,7 @@
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: '{sonar_mvn_goal}'
# cron: '@daily'
# build-node: ubuntu1604-builder-4c-4g
# project: 'multicloud/openstack'
@@ -199,9 +203,29 @@
# mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- project:
+ name: multicloud-openstack-hpa-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: 'multicloud/openstack'
+ project-name: 'multicloud-openstack-hpa'
+ branch: 'master'
+ mvn-params: '-f hpa/pom.xml'
+ mvn-settings: 'multicloud-openstack-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
name: multicloud-openstack-info
project-name: multicloud-openstack
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: multicloud/openstack
branch: master
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 261c94a..2f60151 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -23,5 +23,6 @@
project-name: music-distributed-kv-store
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: music/distributed-kv-store
branch: master
diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
index 273efcf..25773fb 100644
--- a/jjb/music/music-mdbc.yaml
+++ b/jjb/music/music-mdbc.yaml
@@ -34,5 +34,6 @@
project-name: music-mdbc
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: music/mdbc
branch: master
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 0349f9b..295a49e 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -42,5 +42,6 @@
project-name: music-prom
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: music/prom
branch: master
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index a4ac621..b89c750 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
+ build-node: ubuntu1604-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -42,7 +42,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'music'
@@ -68,5 +68,6 @@
project-name: music
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: music
branch: master
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index a2933fb..edd2a33 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -20,5 +20,6 @@
project-name: offline-installer
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: oom/offline-installer
branch: master
diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
index 2daca91..1455f7f 100644
--- a/jjb/oom/oom-oneclick-config.yaml
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -53,5 +53,6 @@
project-name: oomconfig
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: oom
branch: master
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 5dc9d30..4b5a3b3 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -40,5 +40,6 @@
project-name: oom-registrator
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: oom/registrator
branch: master
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index 61ebb75..fd76da2 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -45,5 +45,6 @@
project-name: oparent
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: oparent
branch: master
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 3bee2b1..b4ba623 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -31,9 +31,11 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-cmso-settings'
+ java-version: openjdk11
+
subproject:
- 'cmso':
path: '.'
@@ -49,7 +51,7 @@
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: '{sonar_mvn_goal}'
cron: 'H 11 * * *'
build-node: ubuntu1604-docker-8c-8g
project: 'optf/cmso'
@@ -58,6 +60,7 @@
mvn-settings: 'optf-cmso-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: optf-cmso-clm
@@ -71,14 +74,16 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-cmso-settings'
+ java-version: openjdk11
- project:
name: optf-cmso-info
project-name: optf-cmso
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: optf/cmso
branch: master
diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
index 7c5718a..9f3db13 100644
--- a/jjb/optf/optf-fgps.yaml
+++ b/jjb/optf/optf-fgps.yaml
@@ -89,7 +89,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'optf/fgps'
@@ -116,5 +116,6 @@
project-name: optf-fgps
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: optf/fgps
branch: master
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
new file mode 100644
index 0000000..583703c
--- /dev/null
+++ b/jjb/optf/optf-has-csit.yaml
@@ -0,0 +1,14 @@
+- project:
+ name: optf-has-csit
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: optf-has
+ recipients: 'snarayanan@research.att.com'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'has':
+ trigger_jobs:
+ - '{project-name}-{stream}-conductor-docker-java-version-shell-daily'
+ robot-options: ''
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index f08d7f9..b94af56 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-has-settings'
subproject:
- 'conductor':
@@ -45,8 +45,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-has-settings'
subproject:
- 'conductor':
@@ -77,7 +77,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'optf/has'
@@ -97,8 +97,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-has-settings'
- project:
@@ -106,5 +106,6 @@
project-name: optf-has
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: optf/has
branch: master
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
new file mode 100644
index 0000000..9951184
--- /dev/null
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -0,0 +1,14 @@
+- project:
+ name: optf-osdf-csit
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: optf-osdf
+ recipients: 'snarayanan@research.att.com'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'osdf':
+ trigger_jobs:
+ - '{project-name}-{stream}-osdf-docker-java-version-shell-daily'
+ robot-options: ''
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index d5bcf23..ec149ad 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-osdf-settings'
subproject:
- 'osdf':
@@ -15,8 +15,10 @@
pattern: '**'
pom: 'pom.xml'
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-verify-python':
+ build-node: ubuntu1604-builder-4c-4g
+ - '{project-name}-{stream}-{subproject}-merge-java':
+ build-node: ubuntu1604-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-docker-8c-8g
@@ -43,8 +45,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-osdf-settings'
subproject:
- 'osdf':
@@ -75,9 +77,9 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1604-docker-8c-8g
project: 'optf/osdf'
project-name: 'optf-osdf'
branch: 'master'
@@ -91,13 +93,13 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: optf/osdf
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1604-docker-8c-8g
project-name: 'optf-osdf'
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-osdf-settings'
- project:
@@ -105,5 +107,6 @@
project-name: optf-osdf
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: optf/osdf
branch: master
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 67d3474..1923c76 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -32,6 +32,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-apex-pdp-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-docker-8c-8g
@@ -44,13 +45,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/apex-pdp'
project-name: 'policy-apex-pdp'
branch: 'master'
mvn-settings: 'policy-apex-pdp-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -63,11 +65,13 @@
project-name: 'policy-apex-pdp'
branch: 'master'
mvn-settings: 'policy-apex-pdp-settings'
+ java-version: openjdk11
- project:
name: policy-apex-pdp-info
project-name: policy-apex-pdp
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/apex-pdp
branch: master
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 538f117..534e476 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -26,6 +26,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-api-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -38,13 +39,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/api'
project-name: 'policy-api'
branch: 'master'
mvn-settings: 'policy-api-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -57,11 +59,13 @@
project-name: 'policy-api'
branch: 'master'
mvn-settings: 'policy-api-settings'
+ java-version: openjdk11
- project:
name: policy-api-info
project-name: policy-api
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/api
branch: master
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index ec7d783..1499e00 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -30,7 +30,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/common'
@@ -57,5 +57,6 @@
project-name: policy-common
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/common
branch: master
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 50d64f6..ef02a1d 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -4,6 +4,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
stream:
- 'master':
branch: master
@@ -22,6 +23,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
stream:
- 'master':
@@ -38,6 +40,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
recipients: 'ram.krishna.verma@est.tech'
stream:
- 'master':
@@ -54,6 +57,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
stream:
- 'master':
branch: master
@@ -69,6 +73,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
recipients: 'ah999m@att.com'
stream:
- 'master':
@@ -85,6 +90,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
recipients: 'jrh3@att.com ram.krishna.verma@est.tech'
stream:
- 'master':
@@ -101,6 +107,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
stream:
- 'master':
branch: master
@@ -116,6 +123,7 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'policy'
+ java-version: openjdk11
stream:
- 'master':
branch: master
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index c4ae3aa..661b351 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -26,6 +26,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-distribution-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -38,13 +39,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/distribution'
project-name: 'policy-distribution'
branch: 'master'
mvn-settings: 'policy-distribution-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -57,11 +59,13 @@
project-name: 'policy-distribution'
branch: 'master'
mvn-settings: 'policy-distribution-settings'
+ java-version: openjdk11
- project:
name: policy-distribution-info
project-name: policy-distribution
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/distribution
branch: master
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 63daef9..d5c9d25 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -99,5 +99,6 @@
project-name: policy-docker
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/docker
branch: master
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 905958d..7935f33 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -26,6 +26,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-drools-applications-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-docker-8c-8g
@@ -38,13 +39,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/drools-applications'
project-name: 'policy-drools-applications'
branch: 'master'
mvn-settings: 'policy-drools-applications-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -57,6 +59,7 @@
project-name: 'policy-drools-applications'
branch: 'master'
mvn-settings: 'policy-drools-applications-settings'
+ java-version: openjdk11
build-node: ubuntu1604-docker-8c-8g
- project:
@@ -64,5 +67,6 @@
project-name: policy-drools-applications
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/drools-applications
branch: master
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 93002e1..25b45e0 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -26,6 +26,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-drools-pdp-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-docker-8c-8g
@@ -38,13 +39,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/drools-pdp'
project-name: 'policy-drools-pdp'
branch: 'master'
mvn-settings: 'policy-drools-pdp-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -58,11 +60,13 @@
project-name: 'policy-drools-pdp'
branch: 'master'
mvn-settings: 'policy-drools-pdp-settings'
+ java-version: openjdk11
- project:
name: policy-drools-pdp-info
project-name: policy-drools-pdp
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/drools-pdp
branch: master
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index d1d113e..0ebc274 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -26,6 +26,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-engine-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-docker-8c-8g'
@@ -38,13 +39,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/engine'
project-name: 'policy-engine'
branch: 'master'
mvn-settings: 'policy-engine-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
@@ -58,6 +60,7 @@
project-name: 'policy-engine'
branch: 'master'
mvn-settings: 'policy-engine-settings'
+ java-version: openjdk11
build-node: 'ubuntu1604-builder-4c-4g'
- project:
@@ -65,5 +68,6 @@
project-name: policy-engine
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/engine
branch: master
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644
index 0000000..8ec46fc
--- /dev/null
+++ b/jjb/policy/policy-gui.yaml
@@ -0,0 +1,70 @@
+---
+- project:
+ name: policy-gui
+ project-name: 'policy-gui'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java':
+ docker-pom: 'pom.xml'
+ mvn-params: '-P docker'
+ build-node: ubuntu1604-docker-4c-4g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-4c-4g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
+
+ project: 'policy/gui'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'policy-gui-settings'
+ java-version: openjdk11
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: policy-gui-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: 'policy/gui'
+ project-name: 'policy-gui'
+ branch: 'master'
+ mvn-settings: 'policy-gui-settings'
+ java-version: openjdk11
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-gui-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: policy/gui
+ project-name: 'policy-gui'
+ branch: 'master'
+ mvn-settings: 'policy-gui-settings'
+ java-version: openjdk11
+
+- project:
+ name: policy-gui-info
+ project-name: policy-gui
+ jobs:
+ - gerrit-info-yaml-verify
+ project: policy/gui
+ branch: master
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 1325ddb..8b85b6e 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -17,6 +17,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-models-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -29,13 +30,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/models'
project-name: 'policy-models'
branch: 'master'
mvn-settings: 'policy-models-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -48,11 +50,13 @@
project-name: 'policy-models'
branch: 'master'
mvn-settings: 'policy-models-settings'
+ java-version: openjdk11
- project:
name: policy-models-info
project-name: policy-models
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/models
branch: master
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 4f03585..97dc567 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -26,6 +26,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-pap-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -38,13 +39,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/pap'
project-name: 'policy-pap'
branch: 'master'
mvn-settings: 'policy-pap-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -57,11 +59,13 @@
project-name: 'policy-pap'
branch: 'master'
mvn-settings: 'policy-pap-settings'
+ java-version: openjdk11
- project:
name: policy-pap-info
project-name: policy-pap
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/pap
branch: master
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 86a5326..013bc3e 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -38,5 +38,6 @@
project-name: policy-parent
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/parent
branch: master
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 7c376b7..0915bf0 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -26,6 +26,7 @@
- 'master':
branch: 'master'
mvn-settings: 'policy-xacml-pdp-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -38,13 +39,14 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'policy/xacml-pdp'
project-name: 'policy-xacml-pdp'
branch: 'master'
mvn-settings: 'policy-xacml-pdp-settings'
+ java-version: openjdk11
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -57,11 +59,13 @@
project-name: 'policy-xacml-pdp'
branch: 'master'
mvn-settings: 'policy-xacml-pdp-settings'
+ java-version: openjdk11
- project:
name: policy-xacml-pdp-info
project-name: policy-xacml-pdp
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: policy/xacml-pdp
branch: master
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index c01fd31..43b56a9 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -39,7 +39,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'portal/sdk'
@@ -67,5 +67,6 @@
project-name: portal-sdk
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: portal/sdk
branch: master
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 5bc1697..7edb47b 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -32,7 +32,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'portal'
@@ -93,5 +93,6 @@
project-name: portal
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: portal
branch: master
diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index a754408..735f98c 100644
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -52,6 +52,11 @@
name: sdc-dcae-ci-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/dcae-d/ci'
@@ -77,5 +82,6 @@
project-name: sdc-dcae-d-ci
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/dcae-d/ci
branch: master
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index 7b86851..8aa4bf9 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -47,6 +47,11 @@
name: sdc-dcae-d-dt-be-main-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/dcae-d/dt-be-main'
@@ -72,5 +77,6 @@
project-name: sdc-dcae-d-dt-be-main
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/dcae-d/dt-be-main
branch: master
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
index 39f1c09..8762c08 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -22,6 +22,11 @@
name: sdc-dcae-d-dt-be-property-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/dcae-d/dt-be-property'
@@ -47,5 +52,6 @@
project-name: sdc-dcae-d-dt-be-property
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/dcae-d/dt-be-property
branch: master
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index a334d75..0d91303 100644
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -49,6 +49,11 @@
name: sdc-dcae-d-dt-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/dcae-d/dt'
@@ -75,5 +80,6 @@
project-name: sdc-dcae-d-dt
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/dcae-d/dt
branch: master
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index 8e4149d..b156afd 100644
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -48,6 +48,11 @@
name: sdc-dcae-d-fe-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/dcae-d/fe'
@@ -74,5 +79,6 @@
project-name: sdc-dcae-d-fe
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/dcae-d/fe
branch: master
diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index 71c7dbe..fc0fd42 100644
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -46,6 +46,11 @@
name: sdc-dcae-d-tosca-lab-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-docker-8c-8g
project: 'sdc/dcae-d/tosca-lab'
@@ -61,5 +66,6 @@
project-name: sdc-dcae-d-tosca-lab
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/dcae-d/tosca-lab
branch: master
diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml
index 8f3fcf4..5fc7242 100644
--- a/jjb/sdc/sdc-microservices.yaml
+++ b/jjb/sdc/sdc-microservices.yaml
@@ -39,6 +39,11 @@
name: sdc-microservices-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/microservices'
@@ -64,5 +69,6 @@
project-name: sdc-microservices
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/microservices
branch: master
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index c897042..f3cf944 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -10,6 +10,7 @@
project-name: 'sdc-onap-ui-angular'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'sdc/onap-ui-angular'
branch: 'master'
@@ -33,6 +34,11 @@
name: sdc-onap-ui-angular-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/onap-ui-angular'
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index a614c91..d2f5806 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -4,6 +4,7 @@
project-name: 'sdc-onap-ui-common'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'sdc/onap-ui-common'
branch: 'master'
@@ -27,6 +28,11 @@
name: sdc-onap-ui-common-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/onap-ui-common'
diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml
index 8705f02..bac85d2 100644
--- a/jjb/sdc/sdc-onap-ui-react.yaml
+++ b/jjb/sdc/sdc-onap-ui-react.yaml
@@ -4,6 +4,7 @@
project-name: 'sdc-onap-ui-react'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'sdc/onap-ui-react'
branch: 'master'
@@ -27,6 +28,11 @@
name: sdc-onap-ui-react-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/onap-ui-react'
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 5b7955c..b9e51a6 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -33,6 +33,11 @@
name: sdc-sdc-be-common-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-be-common'
@@ -58,5 +63,6 @@
project-name: sdc-sdc-be-common
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/sdc-be-common
branch: master
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index c7a3424..f509791 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -32,6 +32,11 @@
name: sdc-sdc-distribution-client-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-distribution-client'
@@ -57,5 +62,6 @@
project-name: sdc-sdc-distribution-client
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/sdc-distribution-client
branch: master
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index e53c4b0..1c718ac 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -47,5 +47,6 @@
project-name: sdc-sdc-docker-base
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/sdc-docker-base
branch: master
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index f94773a..7856426 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -4,6 +4,7 @@
project-name: 'sdc-sdc-pubsub'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'sdc/sdc-pubsub'
branch: 'master'
@@ -27,6 +28,11 @@
name: sdc-sdc-pubsub-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-pubsub'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 98725b8..798a7a6 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -32,6 +32,11 @@
name: sdc-sdc-tosca-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-tosca'
@@ -57,5 +62,6 @@
project-name: sdc-sdc-tosca
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/sdc-tosca
branch: master
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index c66789a..698f992 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -58,6 +58,11 @@
name: sdc-sdc-workflow-designer-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-workflow-designer'
@@ -84,5 +89,6 @@
project-name: sdc-sdc-workflow-designer
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc/sdc-workflow-designer
branch: master
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 2498e11..8a8c6b4 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,6 +35,7 @@
mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
- gerrit-maven-stage:
+ build-timeout: 90
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
@@ -78,6 +79,11 @@
name: sdc-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-8c-8g
project: 'sdc'
@@ -121,6 +127,7 @@
project-name: sdc
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdc
branch: master
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 882796a..5775377 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -22,7 +22,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -56,7 +56,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdnc/apps'
@@ -103,5 +103,6 @@
project-name: sdnc-apps
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdnc/apps
branch: master
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 20665a3..7c7094f 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -43,7 +43,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'sdnc/northbound'
@@ -72,5 +72,6 @@
project-name: sdnc-northbound
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdnc/northbound
branch: master
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 563f474..53d26e3 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -19,7 +19,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- cron: ''
+ cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'sdnc/oam'
@@ -74,5 +74,6 @@
project-name: sdnc-oam
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdnc/oam
branch: master
diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
index 5d2be71..1a02f8f 100644
--- a/jjb/sdnc/sdnc-oom.yaml
+++ b/jjb/sdnc/sdnc-oom.yaml
@@ -38,5 +38,6 @@
project-name: sdnc-oom
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: sdnc/oom
branch: master
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 8ad44cb..1a6bdc4 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -30,6 +30,11 @@
name: so-libs-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: 'so/libs'
@@ -54,6 +59,7 @@
project-name: so-libs
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: so/libs
branch: master
branch: elalto
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 9d7d894..323bca4 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -38,6 +38,11 @@
name: so-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'
max-git-repo-age-hours: 48
build-node: ubuntu1604-builder-4c-4g
@@ -94,6 +99,7 @@
project-name: so
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: so
branch: master
branch: elalto
diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
index 12f33fa..2c46a15 100644
--- a/jjb/testsuite/testsuite-heatbridge.yaml
+++ b/jjb/testsuite/testsuite-heatbridge.yaml
@@ -41,5 +41,6 @@
project-name: testsuite-heatbridge
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: testsuite/heatbridge
branch: master
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index f9b756b..a8993e1 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -48,5 +48,6 @@
project-name: testsuite-python-testing-utils
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: testsuite/python-testing-utils
branch: master
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index e85a0c4..fd32c94 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -53,5 +53,6 @@
project-name: testsuite
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: testsuite
branch: master
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index b705594..601c5e5 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -53,5 +53,6 @@
project-name: usecase-ui-server
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: usecase-ui/server
branch: master
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 1e034bf..ee8356b 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -45,5 +45,6 @@
project-name: usecase-ui
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: usecase-ui
branch: master
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 1442e89..9d49b44 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -66,5 +66,6 @@
project-name: vfc-gvnfm-vnflcm
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/gvnfm/vnflcm
branch: master
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 799a18e..d688bcc 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -60,5 +60,6 @@
project-name: vfc-gvnfm-vnfmgr
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/gvnfm/vnfmgr
branch: master
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index fdb61ec..e27e3c6 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -61,5 +61,6 @@
project-name: vfc-gvnfm-vnfres
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/gvnfm/vnfres
branch: master
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 317f8ad..6e2e934 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -61,5 +61,6 @@
project-name: vfc-nfvo-catalog
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/catalog
branch: master
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index b6ba9e9..87c4907 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -30,5 +30,6 @@
project-name: vfc-nfvo-db
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/db
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 9ca9178..7bf8cfb 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -58,5 +58,6 @@
project-name: vfc-nfvo-driver-ems
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/driver/ems
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index aa4e8c6..1696ea5 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -60,5 +60,6 @@
project-name: vfc-nfvo-driver-sfc
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/driver/sfc
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 6bb4318..80680bd 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -55,5 +55,6 @@
project-name: vfc-nfvo-driver-svnfm-huawei
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/driver/vnfm/svnfm
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 6b836dd..a818758 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -63,5 +63,6 @@
project-name: vfc-nfvo-driver-vnfm-gvnfm
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/driver/vnfm/gvnfm
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index 2ce9b1c..d97ec98 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -28,5 +28,6 @@
project-name: vfc-nfvo-driver-svnfm-root
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/driver/vnfm/svnfm
branch: master
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 0feca60..30e6678 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -55,5 +55,6 @@
project-name: vfc-nfvo-lcm
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/lcm
branch: master
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index c5de861..dec3110 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -51,5 +51,6 @@
project-name: vfc-nfvo-multivimproxy
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/multivimproxy
branch: master
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index b377c03..2370d35 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -51,5 +51,6 @@
project-name: vfc-nfvo-resmanagement
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/resmanagement
branch: master
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 1f89eae..ae679b5 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -122,5 +122,6 @@
project-name: vfc-nfvo-wfengine
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vfc/nfvo/wfengine
branch: master
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index bc4b64d..cc8ba89 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -58,7 +58,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'vid'
@@ -84,5 +84,6 @@
project-name: vid
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: vid
branch: master
diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh
index da1d5e2..c27b550 100644
--- a/jjb/vnfrqts/pre-build-needs.sh
+++ b/jjb/vnfrqts/pre-build-needs.sh
@@ -1,8 +1,9 @@
#!/bin/bash
-virtualenv $WORKSPACE/venv-tox
+virtualenv -p python3.6 $WORKSPACE/venv-tox
source $WORKSPACE/venv-tox/bin/activate
pip install --upgrade pip
pip install -r etc/requirements.txt
ls
+wget -O docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1
tox -e needs
\ No newline at end of file
diff --git a/jjb/vnfrqts/vnfrqts-epics.yaml b/jjb/vnfrqts/vnfrqts-epics.yaml
index 4c83e8f..f38f4d8 100644
--- a/jjb/vnfrqts/vnfrqts-epics.yaml
+++ b/jjb/vnfrqts/vnfrqts-epics.yaml
@@ -10,6 +10,7 @@
project: 'vnfrqts/epics'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project-name: 'vnfrqts-epics'
branch: 'master'
mvn-settings: 'vnfrqts-epics-settings'
diff --git a/jjb/vnfrqts/vnfrqts-guidelines.yaml b/jjb/vnfrqts/vnfrqts-guidelines.yaml
index a8f5ece..dbd30a7 100644
--- a/jjb/vnfrqts/vnfrqts-guidelines.yaml
+++ b/jjb/vnfrqts/vnfrqts-guidelines.yaml
@@ -4,6 +4,7 @@
project: 'vnfrqts/guidelines'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project-name: 'vnfrqts-guidelines'
branch: 'master'
mvn-settings: 'vnfrqts-guidelines-settings'
diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml
index 7bb260e..e026fb4 100644
--- a/jjb/vnfrqts/vnfrqts-requirements.yaml
+++ b/jjb/vnfrqts/vnfrqts-requirements.yaml
@@ -4,6 +4,7 @@
project: 'vnfrqts/requirements'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project-name: 'vnfrqts-requirements'
branch: 'master'
mvn-settings: 'vnfrqts-requirements-settings'
diff --git a/jjb/vnfrqts/vnfrqts-testcases.yaml b/jjb/vnfrqts/vnfrqts-testcases.yaml
index 83fb50e..a06e7ed 100644
--- a/jjb/vnfrqts/vnfrqts-testcases.yaml
+++ b/jjb/vnfrqts/vnfrqts-testcases.yaml
@@ -4,6 +4,7 @@
project: 'vnfrqts/testcases'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project-name: 'vnfrqts-testcases'
branch: 'master'
mvn-settings: 'vnfrqts-testcases-settings'
diff --git a/jjb/vnfrqts/vnfrqts-usecases.yaml b/jjb/vnfrqts/vnfrqts-usecases.yaml
index 0fdceb2..5070867 100644
--- a/jjb/vnfrqts/vnfrqts-usecases.yaml
+++ b/jjb/vnfrqts/vnfrqts-usecases.yaml
@@ -4,6 +4,7 @@
project: 'vnfrqts/usecases'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project-name: 'vnfrqts-usecases'
branch: 'master'
mvn-settings: 'vnfrqts-usecases-settings'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 499bfae..8ce93b7 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -68,6 +68,7 @@
name: vnfsdk-dovetail-integration-info
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'vnfsdk/dovetail-integration'
project-name: 'vnfsdk-dovetail-integration'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 583b7b6..3a29d41 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -27,7 +27,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/functest'
@@ -41,6 +41,7 @@
name: vnfsdk-functest-info
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'vnfsdk/functest'
project-name: 'vnfsdk-functest'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml
index e77fa78..e2e365c 100644
--- a/jjb/vnfsdk/vnfsdk-lctest.yaml
+++ b/jjb/vnfsdk/vnfsdk-lctest.yaml
@@ -15,6 +15,7 @@
name: vnfsdk-lctest-info
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'vnfsdk/lctest'
project-name: 'vnfsdk-lctest'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-model.yaml b/jjb/vnfsdk/vnfsdk-model.yaml
index 71808ea..90763d2 100644
--- a/jjb/vnfsdk/vnfsdk-model.yaml
+++ b/jjb/vnfsdk/vnfsdk-model.yaml
@@ -4,6 +4,7 @@
project: 'vnfsdk/model'
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project-name: vnfsdk-model
branch: master
mvn-settings: vnfsdk-model-settings
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index cc516a1..7b2a773 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -37,6 +37,7 @@
name: vnfsdk-pkgtools-info
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'vnfsdk/pkgtools'
project-name: 'vnfsdk-pkgtools'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 53efe17..d94f8cb 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -61,7 +61,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/refrepo'
@@ -75,6 +75,7 @@
name: vnfsdk-refrepo-info
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'vnfsdk/refrepo'
project-name: 'vnfsdk-refrepo'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index b3a664f..d6a48cd 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -26,7 +26,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/validation'
@@ -40,6 +40,7 @@
name: vnfsdk-validation-info
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'vnfsdk/validation'
project-name: 'vnfsdk-validation'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 52751aa..b0a6a2c 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -52,7 +52,7 @@
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: '{sonar_mvn_goal}'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/ves-agent'
@@ -67,6 +67,7 @@
name: vnfsdk-ves-agent-info
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
project: 'vnfsdk/ves-agent'
project-name: 'vnfsdk-ves-agent'
branch: 'master'
diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh
index b90f77b..ef6fedc 100644
--- a/jjb/vvp/pre-build-csv.sh
+++ b/jjb/vvp/pre-build-csv.sh
@@ -1,11 +1,10 @@
#!/bin/bash
-virtualenv -p python3 $WORKSPACE/venv-tox
+virtualenv -p python3.6 $WORKSPACE/venv-tox
source $WORKSPACE/venv-tox/bin/activate
pip3 install --upgrade pip
pip3 install --no-use-pep517 -r requirements.txt
ls
-wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json"
-echo "Copied newest needs."
+wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1
cd ice_validator/
pytest --self-test tests/
\ No newline at end of file
diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml
index 338c79b..b0516ce 100644
--- a/jjb/vvp/vvp-documentation.yaml
+++ b/jjb/vvp/vvp-documentation.yaml
@@ -7,3 +7,4 @@
branch: master
jobs:
- gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index e3b8086..daed681 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -7,7 +7,7 @@
vars:
kubectl_version: 1.11.2
- helm_version: 2.9.1
+ helm_version: 2.12.3
tasks:
- name: 'Install kubectl {{kubectl_version}}'
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index c3c9f17..7b9f9c0 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -67,12 +67,6 @@
become: true
- apt_repository:
- repo: ppa:jonathonf/python-3.6
- state: present
- become: true
- when: ansible_distribution == 'Ubuntu'
-
- - apt_repository:
repo: ppa:deadsnakes/ppa
state: present
become: true
diff --git a/packer/provision/redis.yaml b/packer/provision/redis.yaml
index 495566c..5c45962 100644
--- a/packer/provision/redis.yaml
+++ b/packer/provision/redis.yaml
@@ -22,4 +22,13 @@
service:
name: redis
state: started
- become: true
\ No newline at end of file
+ become: true
+
+ - name: Install Python 3.6 and packages
+ yum:
+ name:
+ - python36u
+ - python36u-libs
+ - python36u-devel
+ state: latest
+ become: true
diff --git a/shell/run_releasedockerhub.sh b/shell/run_releasedockerhub.sh
new file mode 100644
index 0000000..42771af
--- /dev/null
+++ b/shell/run_releasedockerhub.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+echo "---> run_releasedockerhub.sh"
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -o pipefail
+
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv lftools
+
+if [ ! -v RELEASEDOCKERHUB_ORG ]
+then
+ echo "RELEASEDOCKERHUB_ORG is not defined. For onap set it to 'onap'"
+ exit 1
+fi
+
+cmd_str="--org $RELEASEDOCKERHUB_ORG"
+if [ -v RELEASEDOCKERHUB_SUMMARY ]
+then
+ cmd_str+=" --summary"
+fi
+if [ -v RELEASEDOCKERHUB_VERBOSE ]
+then
+ cmd_str+=" --verbose"
+fi
+if [ -v RELEASEDOCKERHUB_REPO ]
+then
+ cmd_str+=" --repo $RELEASEDOCKERHUB_REPO"
+fi
+if [ -v RELEASEDOCKERHUB_EXACT ]
+then
+ cmd_str+=" --exact"
+fi
+
+
+if [ -v RELEASEDOCKERHUB_COPY ]
+then
+ cmd_str+=" --copy"
+fi
+
+echo "cmd_str = >>$cmd_str<<"
+
+# Run the releasedockerhub command in lftools
+lftools nexus docker releasedockerhub $cmd_str