Merge "fix the elalto and maintenance release"
diff --git a/global-jjb b/global-jjb
index 2100921..8914478 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 21009213aa6204bfb40eedc1b11f89a259abd917
+Subproject commit 89144786dbd6e556bc251aeff6b397d6e28eddeb
diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 7872de3..2b0ca12 100644
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -1,6 +1,6 @@
# Cloud Configuration
CLOUD_CREDENTIAL_ID=vexx-ecompci
-CLOUD_URL=https://auth.vexxhost.net/v3/
+CLOUD_URL=https://auth.vexxhost.net/v3
CLOUD_IGNORE_SSL=false
CLOUD_ZONE=ca-ymq-1
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
deleted file mode 100644
index ec5ae3e..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
deleted file mode 100644
index 65e930c..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
deleted file mode 100644
index 56786f7..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20191127-235551.406
-LABELS=ubuntu1604-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index e147067..d69e209 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200311-205153.422
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200506-233718.921
LABELS=ubuntu1804-helm-2c-1g
HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index d450c7b..3c83f0a 100644
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -15,6 +15,7 @@
REGISTRY_PORTS=10001 10002 10003 10004
RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
RELEASE_USERNAME=onap-release
+S3_BUCKET=
SIGUL_BRIDGE_IP=10.30.104.3
SIGUL_KEY=onap-release-2018
SILO=production
diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 412f808..75ce593 100644
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -15,6 +15,7 @@
REGISTRY_PORTS=10001 10002 10003 10004
RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
RELEASE_USERNAME=onap-release
+S3_BUCKET=
SIGUL_BRIDGE_IP=10.30.104.3
SIGUL_KEY=onap-test
SILO=sandbox
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index c94118e..5e4dab4 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -5,6 +5,7 @@
views:
- project-view
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-authz
project-name: 'aaf-authz'
@@ -19,7 +20,7 @@
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
# LF said on 2019-08-01 that this was deprecated
@@ -28,11 +29,13 @@
# settings: '{mvn-settings}'
# script:
# !include-raw-escape: 'build-aaf-docker-image.sh'
-# build-node: 'ubuntu1604-docker-8c-8g'
+# build-node: ubuntu1804-docker-8c-8g'
project: 'aaf/authz'
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aaf-authz-settings'
files: '**'
archive-artifacts: ''
@@ -47,7 +50,7 @@
# settings: '{mvn-settings}'
# script:
# !include-raw-escape: 'build-aaf-docker-image.sh'
-# build-node: 'ubuntu1804-docker-arm64-4c-2g'
+# build-node: ubuntu1804-docker-arm64-4c-2g'
# project: 'aaf/authz'
# stream:
# - 'master':
@@ -66,7 +69,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/authz'
project-name: 'aaf-authz'
branch: 'master'
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 65fb395..64b3bc3 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-cadi
project-name: 'aaf-cadi'
@@ -27,7 +28,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/cadi'
project-name: 'aaf-cadi-shiro'
branch: 'master'
@@ -43,7 +44,7 @@
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'sidecar/fproxy/pom.xml'
mvn-goals: 'docker:build'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/cadi'
docker-image-name: 'onap/fproxy'
stream:
@@ -63,7 +64,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/cadi'
project-name: 'aaf-cadi-fproxy'
branch: 'master'
@@ -79,7 +80,7 @@
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'sidecar/rproxy/pom.xml'
mvn-goals: 'docker:build'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/cadi'
docker-image-name: 'onap/rproxy'
stream:
@@ -99,7 +100,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/cadi'
project-name: 'aaf-cadi-rproxy'
branch: 'master'
@@ -115,7 +116,7 @@
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'sidecar/tproxy-config/pom.xml'
mvn-goals: 'docker:build'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/cadi'
docker-image-name: 'onap/tproxy-config'
stream:
diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml
index 68077b7..990545b 100644
--- a/jjb/aaf/aaf-certservice-csit.yaml
+++ b/jjb/aaf/aaf-certservice-csit.yaml
@@ -1,3 +1,4 @@
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-certservice-csit
jobs:
@@ -7,6 +8,8 @@
stream:
- "master":
branch: "master"
+ - "frankfurt":
+ branch: "frankfurt"
functionality:
- "certservice":
trigger_jobs:
diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 8efdb43..0fb6892 100644
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-certservice
project-name: 'aaf-certservice'
@@ -6,13 +7,16 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
project: 'aaf/certservice'
mvn-settings: 'aaf-certservice-settings'
files: '**'
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
mvn-goals: 'clean install'
@@ -26,7 +30,7 @@
maven-versions-plugin: true
mvn-goals: 'clean deploy -P docker'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -44,7 +48,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/certservice'
project-name: 'aaf-certservice'
branch: 'master'
diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
index 20bf1c8..8d65de8 100644
--- a/jjb/aaf/aaf-luaplugin.yaml
+++ b/jjb/aaf/aaf-luaplugin.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-luaplugin-clm
project-name: 'aaf-luaplugin'
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index a69daaf..5997543 100644
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-sms
project-name: 'aaf-sms'
@@ -6,6 +7,8 @@
path: 'sms-service/src'
golangver: 'golang111'
jobs:
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
- '{project-name}-{stream}-verify-golang'
- '{project-name}-{stream}-merge-golang'
- gerrit-maven-stage:
@@ -21,10 +24,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aaf-sms-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aaf-sms-info
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index 1178902..b3a45fb 100644
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-sshsm
project-name: 'aaf-sshsm'
@@ -18,7 +19,7 @@
mvn-settings: 'aaf-sshsm-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aaf-sshsm-info
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 5f10f9a..4a68af1 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -22,13 +22,14 @@
- 'master':
branch: 'master'
mvn-params: '-P spring-boot-2-1'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
+ mvn-params: '-P spring-boot-2-1'
mvn-settings: 'aai-aai-common-settings'
mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-aai-common-sonar
@@ -40,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/aai-common'
project-name: 'aai-aai-common'
branch: 'master'
@@ -55,7 +56,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/aai-common'
project-name: 'aai-aai-common'
stream:
@@ -81,7 +82,7 @@
- '{project-name}-{stream}-merge-docker'
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
project-name: 'aai-aai-common'
@@ -97,12 +98,12 @@
mvn-settings: 'aai-aai-common-settings'
mvn-version: 'mvn35'
files: 'Dockerfiles/aai-common/**'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: 'aai-aai-common-whitesource'
project-name: 'aai-aai-common'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-params: '-P spring-boot-2-1'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 9f3efcd..13799a5 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -17,21 +17,21 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'aai/babel'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-babel-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-babel-sonar
@@ -43,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/babel'
project-name: 'aai-babel'
branch: 'master'
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index a578d49..ec4b2bd 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -11,7 +11,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -20,13 +20,13 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-cacher-settings'
mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-cacher-sonar
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/cacher'
project-name: 'aai-cacher'
branch: 'master'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index ee20e92..823dab7 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -17,15 +17,15 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'aai/data-router'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-data-router-settings'
@@ -42,7 +42,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/data-router'
project-name: 'aai-data-router'
branch: 'master'
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index ef1a858..ae853d5 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-f distribution/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -26,14 +26,14 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-esr-gui-settings'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-esr-gui-clm
@@ -43,8 +43,8 @@
project: 'aai/esr-gui'
project-name: 'aai-esr-gui'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-esr-gui-settings'
- project:
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 952eebe..1c8b961 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-f standalone/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -26,14 +26,14 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-esr-server-settings'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-esr-server-sonar
@@ -45,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/esr-server'
project-name: 'aai-esr-server'
branch: 'master'
@@ -61,8 +61,8 @@
project: 'aai/esr-server'
project-name: 'aai-esr-server'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-esr-server-settings'
- project:
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 327eced..08ccd0e 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -19,8 +19,8 @@
build-node: centos7-docker-8c-8g
project: 'aai/event-client'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-event-client-settings'
@@ -37,7 +37,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/event-client'
project-name: 'aai-event-client'
branch: 'master'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 0fb84cd..1278ed6 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -26,13 +26,13 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-graphadmin-settings'
mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-graphadmin-sonar
@@ -44,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/graphadmin'
project-name: 'aai-graphadmin'
branch: 'master'
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 4bf9646..1f8078f 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -31,6 +31,36 @@
archive-artifacts: ''
- project:
+ name: aai-graphgraph-sonar
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
+ cron: '@daily'
+ build-node: ubuntu1804-builder-4c-4g
+ project: 'aai/graphgraph'
+ project-name: 'aai-graphgraph'
+ branch: 'master'
+ mvn-settings: 'aai-graphgraph-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: aai-graphgraph-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'aai/graphgraph'
+ project-name: 'aai-graphgraph'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-graphgraph-settings'
+
+- project:
name: aai-graphgraph-info
project-name: aai-graphgraph
jobs:
@@ -38,4 +68,3 @@
build-node: centos7-builder-2c-1g
project: aai/graphgraph
branch: master
-
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 1c0dc70..c1cdbe4 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -19,8 +19,8 @@
build-node: centos7-docker-8c-8g
project: 'aai/logging-service'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-logging-service-settings'
@@ -37,7 +37,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/logging-service'
project-name: 'aai-logging-service'
branch: 'master'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 2a9c7c1..84e2a3e 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -17,22 +17,21 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'aai/model-loader'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
- mvn-params: '-P spring-boot-2-1'
mvn-settings: 'aai-model-loader-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-model-loader-sonar
@@ -44,11 +43,10 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/model-loader'
project-name: 'aai-model-loader'
branch: 'master'
- mvn-params: '-P spring-boot-2-1'
mvn-settings: 'aai-model-loader-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -63,7 +61,6 @@
stream:
- 'master':
branch: 'master'
- mvn-params: '-P spring-boot-2-1'
mvn-settings: 'aai-model-loader-settings'
- project:
@@ -73,17 +70,15 @@
- gerrit-info-yaml-verify
build-node: centos7-builder-2c-1g
project: aai/model-loader
- mvn-params: '-P spring-boot-2-1'
branch: master
- project:
name: 'aai-model-loader-whitesource'
project-name: 'aai-model-loader'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-settings: 'aai-model-loader-settings'
- mvn-params: '-P spring-boot-2-1'
wss-product-name: 'aai'
mvn-clean-install: true
project: 'aai/model-loader'
diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
index 9b92ea1..4ea6eb8 100644
--- a/jjb/aai/aai-oom.yaml
+++ b/jjb/aai/aai-oom.yaml
@@ -19,8 +19,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-oom-settings'
files: '**'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 0aa2168..fee95b4 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -26,13 +26,13 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-resources-settings'
mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-resources-sonar
@@ -44,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/resources'
project-name: 'aai-resources'
branch: 'master'
@@ -78,7 +78,7 @@
- project:
name: 'aai-resources-whitesource'
project-name: 'aai-resources'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-settings: 'aai-resources-settings'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index ffe1633..c641d98 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -19,8 +19,8 @@
build-node: centos7-docker-8c-8g
project: 'aai/rest-client'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-rest-client-settings'
@@ -37,7 +37,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/rest-client'
project-name: 'aai-rest-client'
branch: 'master'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 9cb614e..316c5dd 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -19,8 +19,8 @@
build-node: centos7-docker-8c-8g
project: 'aai/router-core'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-router-core-settings'
@@ -37,7 +37,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/router-core'
project-name: 'aai-router-core'
branch: 'master'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 9351c85..24c640e 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -26,13 +26,13 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-schema-service-settings'
mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-schema-service-sonar
@@ -44,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/schema-service'
project-name: 'aai-schema-service'
branch: 'master'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index a780e9c..1d68ea5 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -25,8 +25,8 @@
project: 'aai/search-data-service'
docker-image-name: 'onap/search-data-service'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-search-data-service-settings'
@@ -39,7 +39,7 @@
jobs:
- gerrit-maven-docker-stage:
mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
project: 'aai/search-data-service'
@@ -61,7 +61,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/search-data-service'
project-name: 'aai-search-data-service'
branch: 'master'
@@ -93,7 +93,7 @@
- project:
name: 'aai-search-data-service-whitesource'
project-name: 'aai-search-data-service'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-settings: 'aai-search-data-service-settings'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index c27ea71..49c9941 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -17,15 +17,15 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'aai/sparky-be'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-sparky-be-settings'
@@ -42,7 +42,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/sparky-be'
project-name: 'aai-sparky-be'
branch: 'master'
@@ -74,7 +74,7 @@
- project:
name: 'aai-sparky-be-whitesource'
project-name: 'aai-sparky-be'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 63596ee..4ac85e0 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -7,14 +7,14 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- gerrit-maven-stage:
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'aai/sparky-fe'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-sparky-fe-settings'
@@ -40,7 +40,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/sparky-fe'
project-name: 'aai-sparky-fe'
branch: 'master'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index e359715..b6178bb 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -26,13 +26,13 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aai-traversal-settings'
mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-traversal-sonar
@@ -44,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/traversal'
project-name: 'aai-traversal'
branch: 'master'
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index a755f5e..2fab17b 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -17,21 +17,21 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
mvn-params: 'docker:build -B -Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'aai/validation'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'master':
branch: 'master'
mvn-settings: 'aai-validation-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aai-validation-sonar
@@ -43,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aai/validation'
project-name: 'aai-validation'
branch: 'master'
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 9a2c190..26764c6 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -16,10 +16,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-cdt-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: appc-cdt-clm
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index ee14b23..edffd6b 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -11,13 +11,15 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: appc-deployment-docker
@@ -28,7 +30,7 @@
- 'docker-version-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-versions-plugin: true
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
@@ -39,13 +41,15 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
#- project:
# name: appc-deployment-arm64-docker
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index dd7353f..513126b 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -4,11 +4,11 @@
project-name: 'appc'
jobs:
- '{project-name}-{stream}-verify-java':
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- '{project-name}-{stream}-merge-java':
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- gerrit-maven-stage:
@@ -26,11 +26,13 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-settings'
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: appc-sonar
@@ -42,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'appc'
project-name: 'appc'
branch: 'master'
@@ -57,7 +59,7 @@
- gerrit-maven-clm:
mvn-params: '-DskipTests'
build-timeout: 60
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
nexus-iq-namespace: 'onap-'
project: 'appc'
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index 2ada1b0..c717284 100644
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -22,6 +22,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-parent-settings'
maven-version: "mvn35"
build-node: ubuntu1804-builder-4c-4g
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index e5b29ba..c6c3f56 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -17,7 +17,7 @@
sign-artifacts: true
cron: ''
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -41,7 +41,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -55,7 +55,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/apps'
project-name: 'ccsdk-apps'
branch: 'master'
@@ -78,7 +78,7 @@
branch: 'frankfurt'
mvn-settings: 'ccsdk-apps-settings'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: ccsdk-apps-arm64-docker
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 61435e7..beb0c17 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -12,7 +12,7 @@
maven-versions-plugin: true
cron: ''
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -39,7 +39,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -53,7 +53,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/cds'
project-name: 'ccsdk-cds'
branch: 'master'
@@ -76,7 +76,7 @@
branch: 'frankfurt'
mvn-settings: 'ccsdk-cds-settings'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 764aba8..353ee2d 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -12,7 +12,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -32,7 +32,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index aacfe89..47e616b 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -12,7 +12,7 @@
maven-versions-plugin: true
cron: ''
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'ccsdk-distribution-settings'
@@ -33,7 +35,7 @@
maven-version: "mvn35"
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -68,7 +70,7 @@
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'ccsdk-distribution-settings'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
@@ -83,7 +85,7 @@
- project:
name: ccsdk-distribution-whitesource
project-name: ccsdk-distribution
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- gerrit-whitesource-scan:
java-opts: '-Xmx2048m'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 0a0120e..17dd0b4 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -29,7 +29,7 @@
archive-artifacts: ''
maven-version: "mvn35"
mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -43,13 +43,13 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/features'
project-name: 'ccsdk-features'
branch: 'master'
mvn-settings: 'ccsdk-features-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+ mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
maven-version: "mvn35"
- project:
@@ -65,8 +65,9 @@
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'ccsdk-features-settings'
+ mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: ccsdk-features-info
@@ -79,12 +80,13 @@
- project:
name: ccsdk-features-whitesource
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-4c-4g
project-name: ccsdk-features
jobs:
- gerrit-whitesource-scan
mvn-settings: 'ccsdk-features-settings'
wss-product-name: ccsdk
mvn-clean-install: true
+ mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
project: ccsdk/features
branch: master
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index a29b096..0d3a3ee 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -45,7 +45,7 @@
branch: 'frankfurt'
mvn-settings: 'ccsdk-parent-settings'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
deleted file mode 100644
index 6a943f0..0000000
--- a/jjb/ccsdk/platform-plugins.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-- project:
- name: ccsdk-platform-plugins
- project-name: 'ccsdk-platform-plugins'
- jobs:
- - gerrit-maven-verify
- - gerrit-maven-merge:
- cron: '@daily'
- - gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
- sign-artifacts: true
- cron: ''
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
- project: 'ccsdk/platform/plugins'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'ccsdk-platform-plugins-settings'
- # due to a strange macro / variable translation problem this needs to be
- # passed as a string block to properly get the properties correctly defined
- # in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: centos7-redis-4c-4g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
-
-- project:
- name: ccsdk-platform-plugins-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: centos7-redis-4c-4g
- project: 'ccsdk/platform/plugins'
- project-name: 'ccsdk-platform-plugins'
- branch: 'master'
- mvn-settings: 'ccsdk-platform-plugins-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: ccsdk-platform-plugins-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/platform/plugins'
- project-name: 'ccsdk-platform-plugins'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'ccsdk-platform-plugins-settings'
- build-node: centos7-redis-4c-4g
-
-
-- project:
- name: ccsdk-platform-plugins-info
- project-name: ccsdk-platform-plugins
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: ccsdk/platform/plugins
- branch: master
-
-- project:
- name: ccsdk-platform-plugins-whitesource
- project-name: ccsdk-platform-plugins
- jobs:
- - gerrit-whitesource-scan
- mvn-settings: 'ccsdk-platform-plugins-settings'
- wss-product-name: ccsdk
- mvn-clean-install: true
- project: ccsdk/platform/plugins
- branch: master
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 8b65dc8..ad92332 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -31,7 +31,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -45,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/sli/adaptors'
project-name: 'ccsdk-sli-adaptors'
branch: 'master'
@@ -68,7 +68,7 @@
branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-adaptors-settings'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
@@ -82,7 +82,7 @@
- project:
name: ccsdk-sli-adaptors-whitesource
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-4c-4g
project-name: ccsdk-sli-adaptors
jobs:
- gerrit-whitesource-scan
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 946a4fb..0fc6d6c 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -31,7 +31,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -45,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/sli/core'
project-name: 'ccsdk-sli-core'
branch: 'master'
@@ -68,7 +68,7 @@
branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-core-settings'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 8cd692b..d130cb1 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -31,7 +31,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -45,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/sli/northbound'
project-name: 'ccsdk-sli-northbound'
branch: 'master'
@@ -68,7 +68,7 @@
branch: 'frankfurt'
mvn-settings: 'ccsdk-sli-northbound-settings'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index aec06db..4f99ad8 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -31,7 +31,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -45,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/sli/plugins'
project-name: 'ccsdk-sli-plugins'
branch: 'master'
diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index 6003bf2..c9a8f5e 100644
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -20,6 +20,7 @@
View Defects</a>.</li>
</ol>
<p>Please note that processing data takes some time. You will get an email when it's done.</p>
+ <p>See more <a href="https://wiki.onap.org/x/Y6vQAw">Coverity Scan HOWTOs</a> on ONAP Developer Wiki.</p>
<hr/>
project-type: freestyle
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index f8014bf..79b4853 100644
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -14,7 +14,6 @@
platforms:
- centos-7
- - ubuntu-16.04
- ubuntu-18.04
templates: builder
@@ -33,7 +32,6 @@
platforms:
- centos-7
- - ubuntu-16.04
- ubuntu-18.04-arm64
- ubuntu-18.04
templates: docker
diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml
index 43d5f09..dfab260 100644
--- a/jjb/ci-management/ci-management-views.yaml
+++ b/jjb/ci-management/ci-management-views.yaml
@@ -52,7 +52,10 @@
- common-view
view-name: All-Coverity
view-regex: '.*-coverity'
- view-description: 'List of Coverity jobs'
+ view-description: >
+ <h1>List of Coverity Scan static code analysis jobs</h1>
+ <p>See <a href="https://wiki.onap.org/x/Y6vQAw">how to add your component to Coverity Scan</a>
+ on ONAP Developer Wiki.</p>
- view:
name: CLM
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index b31cffa..8b4d6e5 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -18,6 +18,9 @@
build-timeout: '60'
build-node: 'centos7-builder-2c-1g'
jjb-version: 2.9.1
+ # configure the gerrit-jjb-verify job
+ build-node-label-check: true
+ build-node-label-list: ""
- project:
name: builder-openstack
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index dae2418..67b3f67 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -10,10 +10,10 @@
project-name: 'clamp'
jobs:
- gerrit-maven-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -31,13 +31,15 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'elalto':
branch: 'elalto'
mvn-settings: 'clamp-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: clamp-sonar
@@ -50,7 +52,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'clamp'
project-name: 'clamp'
branch: 'master'
@@ -69,7 +71,7 @@
project-name: 'clamp'
branch: 'master'
mvn-settings: 'clamp-settings'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
build-timeout: 120
java-version: openjdk11
diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml
index 2cea7f5..ce70c19 100644
--- a/jjb/clamp/dashboard/clamp-dashboard.yaml
+++ b/jjb/clamp/dashboard/clamp-dashboard.yaml
@@ -10,10 +10,10 @@
project-name: 'clamp-dashboard'
jobs:
- gerrit-maven-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -35,7 +35,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
#- project:
# name: clamp-dashboard-sonar
@@ -48,7 +48,7 @@
# sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
# sonar-mvn-goal: '{sonar_mvn_goal}'
# cron: '@daily'
-# build-node: ubuntu1604-docker-8c-8g
+# build-node: ubuntu1804-docker-8c-8g
# project: 'clamp/dashboard'
# project-name: 'clamp-dashboard'
# branch: 'master'
@@ -67,6 +67,6 @@
project-name: 'clamp-dashboard'
branch: 'master'
mvn-settings: 'clamp-settings'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
build-timeout: 120
java-version: openjdk11
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index ef105ff..4d1f3de 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -28,7 +28,7 @@
pom: 'deployment/docker/pom.xml'
mvn-goals: 'docker:build'
docker-image-name: 'onap/cli'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'cli'
stream:
- 'master':
@@ -36,7 +36,7 @@
mvn-settings: 'cli-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: cli-arm64
@@ -66,7 +66,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'cli'
project-name: 'cli'
branch: 'master'
@@ -83,7 +83,7 @@
project-name: 'cli'
branch: 'master'
mvn-settings: 'cli-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: cli-info
diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
index fa3ad68..4e65ab9 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
@@ -29,7 +29,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/analytics/pnda'
project-name: 'dcaegen2-analytics-pnda'
branch: 'master'
@@ -43,7 +43,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/analytics/pnda
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project-name: 'dcaegen2-analytics-pnda'
branch: 'master'
mvn-settings: 'dcaegen2-analytics-pnda-settings'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 197660a..0737cbd 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/analytics/tca-gen2'
mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
@@ -13,7 +15,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
- '{project-name}-{stream}-merge-java':
@@ -21,7 +23,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean deploy docker:build -DpushImage'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -39,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/analytics/tca-gen2'
project-name: 'dcaegen2-analytics-tca-gen2'
branch: 'master'
@@ -53,7 +55,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/analytics/tca-gen2
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-analytics-tca-gen2'
branch: 'master'
mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index 2e2296c..e0e4c05 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/analytics/tca'
mvn-settings: 'dcaegen2-analytics-tca-settings'
@@ -14,7 +16,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-java':
@@ -38,7 +40,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/analytics/tca'
project-name: 'dcaegen2-analytics-tca'
branch: 'master'
@@ -54,7 +56,7 @@
project: 'dcaegen2/analytics/tca'
project-name: 'dcaegen2-analytics-tca'
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-settings: 'dcaegen2-analytics-tca-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 733f9c4..3f4f911 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/collectors/datafile'
mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -13,7 +15,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-maven-stage:
sign-artifacts: true
@@ -22,7 +24,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -41,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/datafile'
project-name: 'dcaegen2-collectors-datafile'
branch: 'master'
@@ -55,7 +57,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/datafile
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-datafile'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-datafile-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index a171bde..3ab5a74 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -7,6 +7,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
# apply to all jobs
project: 'dcaegen2/collectors/hv-ves'
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
@@ -14,7 +17,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
mvn-goals: 'clean install'
@@ -28,7 +31,7 @@
maven-versions-plugin: true
mvn-goals: 'clean deploy -Ddocker.skip'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -44,7 +47,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/hv-ves'
project-name: 'dcaegen2-collectors-hv-ves'
branch: 'master'
@@ -61,7 +64,7 @@
project: dcaegen2/collectors/hv-ves
project-name: 'dcaegen2-collectors-hv-ves'
branch: 'master'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 72c5a55..7c72a16 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -10,7 +10,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -29,7 +31,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-collectors-restconf-sonar
@@ -41,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/restconf'
project-name: 'dcaegen2-collectors-restconf'
branch: 'master'
@@ -55,7 +57,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/restconf
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-restconf'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index b94302f..c2d604a 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -21,7 +23,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-collectors-snmptrap-sonar
@@ -33,7 +35,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/collectors/snmptrap'
project-name: 'dcaegen2-collectors-snmptrap'
branch: 'master'
@@ -47,7 +49,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/snmptrap
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-snmptrap'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 43201bd..8896237 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -11,7 +11,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -22,6 +22,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-collectors-ves-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -30,7 +32,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-collectors-ves-sonar
@@ -43,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/ves'
project-name: 'dcaegen2-collectors-ves'
branch: 'master'
@@ -57,7 +59,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/ves
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-ves'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index d31538d..c5b80e4 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -12,6 +12,10 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-deployments-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -28,7 +32,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: dcaegen2/deployments
project-name: 'dcaegen2-deployments'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 450bd4f..7d57150 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-blueprints-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -20,7 +22,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-blueprints-clm
@@ -28,7 +30,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/blueprints
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-blueprints'
branch: 'master'
mvn-settings: 'dcaegen2-platform-blueprints-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 78d12ee..221e0f5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -14,7 +14,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
# used by tox-install.sh to specify the interpreter used to install tox
python-version: python3
jobs:
@@ -28,22 +28,29 @@
stream:
- master:
branch: master
+ - frankfurt:
+ branch: frankfurt
- project:
name: dcaegen2-platform-configbinding-sonar
- project: dcaegen2/platform/configbinding
- project-name: dcaegen2-platform-configbinding
- cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
- # Sonar jobs use maven to push report
- mvn-settings: dcaegen2-platform-configbinding-settings
- mvn-goals: 'clean test'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- branch: master
- # used by tox-install.sh to specify the interpreter used to install tox
- python-version: python3
jobs:
- gerrit-tox-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
+ cron: '@daily'
+ build-node: ubuntu1804-docker-8c-8g
+ project: 'dcaegen2/platform/configbinding'
+ project-name: 'dcaegen2-platform-configbinding'
+ branch: 'master'
+ # used by tox-install.sh to specify the interpreter used to install tox
+ python-version: python3
+ mvn-settings: 'dcaegen2-platform-configbinding-settings'
+ mvn-goals: 'clean test'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
- project:
name: dcaegen2-platform-configbinding-info
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index c03f0d2..0aaf8c9 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -20,7 +22,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-deployment-handler-clm
@@ -28,7 +30,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/deployment-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-deployment-handler'
branch: 'master'
mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 685582e..1268c50 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -50,7 +50,17 @@
stream: all
branch: '*'
- gerrit-docker-verify
- - gerrit-docker-merge
+ - gerrit-docker-merge:
+ post_docker_build_script: |
+ #!/bin/bash
+ set -uex -o pipefail
+ DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+ DNAME={container-snapshot-registry}/{docker-name}
+ docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+ docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+ docker push $DNAME:$DOCKER_IMAGE_TAG2
+ docker push $DNAME:latest
+
- gerrit-maven-clm:
mvn-params: '-f {src-dir}'
stream: master
@@ -71,7 +81,7 @@
name: dcaegen2-platform-docker-python-subprojects
project: dcaegen2/platform
mvn-settings: dcaegen2-platform-settings
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name:
- dcaegen2-platform-adapter-acumos:
src-dir: adapter/acumos
@@ -88,6 +98,8 @@
stream:
- master:
branch: master
+ - frankfurt:
+ branch: frankfurt
views:
- project-view:
project-name: dcaegen2-platform-adapter
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 6f97d6f..69d3ba1 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -12,7 +12,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImage'
@@ -21,6 +21,9 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-inventory-api-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -29,10 +32,11 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-inventory-api-sonar
+ java-version: openjdk11
jobs:
- gerrit-maven-sonar
sonarcloud: true
@@ -41,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform/inventory-api'
project-name: 'dcaegen2-platform-inventory-api'
branch: 'master'
@@ -51,11 +55,12 @@
- project:
name: dcaegen2-platform-inventory-api-clm
+ java-version: openjdk11
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/inventory-api
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-inventory-api'
branch: 'master'
mvn-settings: 'dcaegen2-platform-inventory-api-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index 855be90..de506f8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -22,9 +22,11 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-settings'
maven-deploy-properties: |
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 2402dd0..5a8a623 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -15,10 +15,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
@@ -27,7 +29,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-mod-designtool'
branch: 'master'
mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index f3ad499..73ffe09 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -15,10 +15,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: dcaegen2-platform-mod-genprocessor-sonar
@@ -30,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: 'dcaegen2-platform-mod-genprocessor'
branch: 'master'
@@ -44,7 +46,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-mod-genprocessor-clm
mvn-params: '-f mod/genprocessor/pom.xml'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index cdfd3c6..abea091 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -15,10 +15,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: dcaegen2-platform-mod-runtimeapi-sonar
@@ -30,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: 'dcaegen2-platform-mod-runtimeapi'
branch: 'master'
@@ -44,7 +46,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-mod-runtimeapi-clm
mvn-params: '-f mod/runtimeapi/pom.xml'
diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
index c38e1c8..bf5c6c4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
@@ -18,7 +18,7 @@
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: dcaegen2-platform-oti-event-proc-release
@@ -35,7 +35,7 @@
mvn-goals: 'clean deploy -Ddockerfile.skip -f oti/event-proc/pom.xml'
pattern: 'oti/event-proc/**'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean package dockerfile:build dockerfile:push -f oti/event-proc/pom.xml'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -49,7 +49,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-oti-event-proc-sonar
@@ -61,7 +61,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: 'dcaegen2-platform-oti-event-proc'
branch: 'master'
@@ -76,7 +76,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-oti-event-proc-clm
mvn-params: '-f oti/event-proc/pom.xml'
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 31d7d11..af7d874 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-plugins-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index 7d403d2..07722a5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-policy-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -20,7 +22,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-policy-handler-sonar
@@ -32,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform/policy-handler'
project-name: 'dcaegen2-platform-policy-handler'
branch: 'master'
@@ -46,7 +48,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/policy-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-policy-handler'
branch: 'master'
mvn-settings: 'dcaegen2-platform-policy-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index db819a1..4f5f997 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -12,7 +12,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImage'
@@ -21,7 +21,8 @@
stream:
- 'master':
branch: 'master'
-
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -30,7 +31,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-servicechange-handler-clm
@@ -38,7 +39,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/servicechange-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-servicechange-handler'
branch: 'master'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index eec174a..776eea2 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: dcaegen2-services-bbs-event-processor
+ name: dcaegen2-services-bbs-event-processor-verify
project: 'dcaegen2/services'
project-name: 'dcaegen2-services'
jobs:
@@ -15,6 +15,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
maven-version: 'mvn35'
maven-deploy-properties: |
@@ -39,7 +42,7 @@
pattern: 'components/bbs-event-processor/**'
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
+ mvn-goals: 'clean package -Dmaven.deploy.skip=true dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
pattern: 'components/bbs-event-processor/**'
@@ -66,7 +69,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/services'
project-name: 'dcaegen2-services-bbs-event-processor'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 4b43e2c..468b07a 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -13,12 +13,14 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-datalake-handler-release
@@ -34,7 +36,7 @@
version-properties-file: 'components/datalake-handler/version.properties'
pattern: 'components/datalake-handler/**'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -42,12 +44,14 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-datalake-handler-admin-ui-release
@@ -63,7 +67,7 @@
version-properties-file: 'components/datalake-handler/version.properties'
pattern: 'components/datalake-handler/**'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -71,12 +75,14 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-datalake-handler-sonar
@@ -88,7 +94,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services'
project-name: 'dcaegen2-services-datalake-handler'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index be95546..3c2c28c 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -57,7 +57,16 @@
stream: master
branch: 'master'
- gerrit-docker-verify
- - gerrit-docker-merge
+ - gerrit-docker-merge:
+ post_docker_build_script: |
+ #!/bin/bash
+ set -uex -o pipefail
+ DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+ DNAME={container-snapshot-registry}/{docker-name}
+ docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+ docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+ docker push $DNAME:$DOCKER_IMAGE_TAG2
+ docker push $DNAME:latest
- gerrit-whitesource-scan:
build-timeout: 120
submodule-timeout: 30
@@ -82,6 +91,8 @@
stream:
- master:
branch: master
+ - frankfurt:
+ branch: frankfurt
views:
- project-view:
project-name: dcaegen2-services-pmsh
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index e9c8531..47fa28b 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-heartbeat-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -21,7 +23,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-heartbeat-sonar
@@ -33,7 +35,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/heartbeat'
project-name: 'dcaegen2-services-heartbeat'
branch: 'master'
@@ -47,7 +49,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/heartbeat
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-heartbeat'
branch: 'master'
mvn-settings: 'dcaegen2-services-heartbeat-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 76c1337..6690f20 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean package docker:build -DpushImage'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -21,10 +21,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-mapper-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
maven-deploy-properties: |
deployAtEnd=true
@@ -38,7 +40,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/services/mapper'
project-name: 'dcaegen2-services-mapper'
branch: 'master'
@@ -52,7 +54,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/mapper
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-mapper'
branch: 'master'
mvn-settings: 'dcaegen2-services-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
old mode 100644
new mode 100755
index dca7dd5..55c5e90
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,6 +6,9 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/services/pm-mapper'
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -13,7 +16,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
mvn-goals: 'clean install docker:build'
@@ -26,7 +29,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean install docker:build docker:push'
@@ -41,10 +44,11 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/pm-mapper'
project-name: 'dcaegen2-services-pm-mapper'
branch: 'master'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -55,9 +59,10 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/pm-mapper
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-pm-mapper'
branch: 'master'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index bb5aa84..051c958 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -10,7 +10,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build docker:push'
@@ -21,10 +21,13 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
maven-deploy-properties: |
deployAtEnd=true
@@ -38,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
project: 'dcaegen2/services/prh'
project-name: 'dcaegen2-services-prh'
@@ -53,7 +56,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/prh
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
project-name: 'dcaegen2-services-prh'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 4d90397..d8500b8 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -17,6 +17,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-sdk-settings'
files: '**'
archive-artifacts: ''
@@ -30,7 +33,7 @@
jobs:
- '{project-name}-{stream}-integration-pairwise':
build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/sdk'
project-name: 'dcaegen2-services-sdk'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 27d546b..d536d1a 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -10,7 +10,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -21,10 +21,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-son-handler-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
maven-deploy-properties: |
deployAtEnd=true
@@ -38,7 +40,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/son-handler'
project-name: 'dcaegen2-services-son-handler'
branch: 'master'
@@ -52,7 +54,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/son-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-son-handler'
branch: 'master'
mvn-settings: 'dcaegen2-services-son-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 9388c2b..f0f2c74 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-utils-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
@@ -21,7 +23,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-utils-sonar
@@ -33,7 +35,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/utils'
project-name: 'dcaegen2-utils'
branch: 'master'
@@ -47,7 +49,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/utils
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-utils'
branch: 'master'
mvn-settings: 'dcaegen2-utils-settings'
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 1305937..318949a 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 5c4028e..e7bf8fb 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -22,8 +22,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'demo-settings'
files: '**'
archive-artifacts: ''
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'demo'
project-name: 'demo'
branch: 'master'
@@ -54,3 +54,31 @@
build-node: centos7-builder-2c-1g
project: demo
branch: master
+
+- project:
+ name: demo-linters
+ project: 'demo'
+ project-name: 'demo'
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'python':
+ tox-dir: '.'
+ tox-envs: 'py'
+ pattern: '**/*.py'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index d24124f..39a6a37 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,27 +6,48 @@
- project-view
- project:
- name: dmaap-buscontroller
+ name: dmaap-buscontroller-java11
project-name: 'dmaap-buscontroller'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean package -P docker docker:build docker:push'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
-
project: 'dmaap/buscontroller'
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dmaap-buscontroller-settings'
files: '**'
archive-artifacts: ''
+ java-version: openjdk11
+- project:
+ name: dmaap-buscontroller-java8
+ project-name: 'dmaap-buscontroller'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ mvn-goals: 'clean package -P docker docker:build docker:push'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/buscontroller'
+ stream:
+ - 'elalto':
+ branch: 'elalto'
+ mvn-settings: 'dmaap-buscontroller-settings'
+ files: '**'
+ archive-artifacts: ''
+ java-version: openjdk8
# removed sonar job from this template because this repo only builds a docker container
# and the 0% coverage report from Sonar was causing repeated escalations.
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 18cb107..ffd5a2d 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,26 +1,47 @@
- project:
- name: dmaap-datarouter
+ name: dmaap-datarouter-java11
project-name: 'dmaap-datarouter'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean package -P docker docker:build docker:push'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
-
project: 'dmaap/datarouter'
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-datarouter-settings'
+ files: '**'
+ archive-artifacts: ''
+ java-version: openjdk11
+
+
+- project:
+ name: dmaap-datarouter-java8
+ project-name: 'dmaap-datarouter'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ mvn-goals: 'clean package -P docker docker:build docker:push'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/datarouter'
+ stream:
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'elalto':
branch: 'elalto'
mvn-settings: 'dmaap-datarouter-settings'
files: '**'
archive-artifacts: ''
+ java-version: openjdk8
- project:
name: dmaap-datarouter-sonar
@@ -32,13 +53,14 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/datarouter'
project-name: 'dmaap-datarouter'
branch: 'master'
mvn-settings: 'dmaap-datarouter-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: dmaap-datarouter-clm
@@ -49,6 +71,7 @@
project-name: 'dmaap-datarouter'
branch: 'master'
mvn-settings: 'dmaap-datarouter-settings'
+ java-version: openjdk11
- project:
name: dmaap-datarouter-info
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 5793822..4eeafa9 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: dmaap-dbcapi
+ name: dmaap-dbcapi-java11
project-name: 'dmaap-dbcapi'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -11,13 +11,14 @@
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
-
project: 'dmaap/dbcapi'
mvn-settings: 'dmaap-dbcapi-settings'
java-version: openjdk11
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# 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
@@ -27,6 +28,31 @@
archive-artifacts: ''
- project:
+ name: dmaap-dbcapi-java8
+ project-name: 'dmaap-dbcapi'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ project: 'dmaap/dbcapi'
+ mvn-settings: 'dmaap-dbcapi-settings'
+ java-version: openjdk8
+ stream:
+ - 'elalto':
+ branch: 'elalto'
+ # 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: ''
+
+
+- project:
name: dmaap-dbcapi-sonar
jobs:
- gerrit-maven-sonar
@@ -36,7 +62,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/dbcapi'
project-name: 'dmaap-dbcapi'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
index b09e30e..1b3bfa6 100644
--- a/jjb/dmaap/dmaap-kafka-docker.yaml
+++ b/jjb/dmaap/dmaap-kafka-docker.yaml
@@ -5,7 +5,7 @@
project-name: 'dmaap-kafka-docker'
jobs:
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -21,7 +21,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: dmaap-kafka-docker-info
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
index f3b4fb8..350eb03 100644
--- a/jjb/dmaap/dmaap-kafka.yaml
+++ b/jjb/dmaap/dmaap-kafka.yaml
@@ -21,7 +21,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/kafka11aaf'
project-name: 'dmaap-kafka'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index d92e85a..6549204 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -29,7 +29,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/messagerouter/dmaapclient'
project-name: 'dmaap-messagerouter-dmaapclient'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 21a8ba5..82c12d3 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -5,7 +5,7 @@
project-name: 'dmaap-messagerouter-docker'
jobs:
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-params: '-P docker -Dmaven.test.skip=true'
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
@@ -21,7 +21,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: dmaap-messagerouter-docker-clm
@@ -30,7 +30,7 @@
nexus-iq-namespace: 'onap-'
project: dmaap/messagerouter/messageservice
project-name: 'dmaap-messagerouter-docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
branch: 'master'
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index ba23d9a..3c0df03 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -28,7 +28,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/messagerouter/messageservice'
project-name: 'dmaap-messagerouter-messageservice'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 2d32ea0..331176a 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -30,7 +30,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/messagerouter/mirroragent'
project-name: 'dmaap-messagerouter-mirroragent'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 90baffd..2d872f7 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -30,7 +30,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/messagerouter/msgrtr'
project-name: 'dmaap-messagerouter-msgrtr'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml
index e17fbe0..4a0b523 100644
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-zookeeper.yaml
@@ -15,7 +15,7 @@
project-name: 'dmaap-zookeeper-docker'
jobs:
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-params: '-P docker -Dmaven.test.skip=true'
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
@@ -31,7 +31,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: dmaap-zookeeper-info
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index f03cce0..c714112 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -18,8 +18,6 @@
rtdproject: 'onap/58810/'
mvn-settings: 'doc-settings'
stream:
- - master:
- branch: 'master'
- amsterdam:
branch: 'amsterdam'
- beijing:
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 71ca922..7620cca 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -17,7 +17,7 @@
maven-versions-plugin: true
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -32,7 +32,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: externalapi-nbi-arm64
@@ -74,7 +74,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'externalapi/nbi'
project-name: 'externalapi-nbi'
branch: 'master'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 9c70eec..13afecf 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -496,6 +496,15 @@
</org.jenkinsci.plugins.golang.GolangBuildWrapper>
- wrapper:
+ name: golang114
+ wrappers:
+ - raw:
+ xml: |
+ <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+ <goVersion>Golang 1.14</goVersion>
+ </org.jenkinsci.plugins.golang.GolangBuildWrapper>
+
+- wrapper:
# This wrapper is required for all jobs as it configures the wrappers
# needed by the eCOMP infra.
name: infra-wrappers
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 0df1293..f78cce7 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -84,7 +84,7 @@
name: '{project-name}-{stream}-docker-c-shell-daily'
id: gerrit-docker-c-shell-daily
<<: *c_job_common
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
triggers:
# 12 AM UTC
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 2615157..4d48b87 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -157,7 +157,7 @@
name: '{project-name}-{stream}-docker-golang-shell-daily'
golangver: 'golang110'
project-type: freestyle
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
disabled: false
properties:
- infra-properties:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index bcf4bd3..60f1ad6 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -451,6 +451,11 @@
<<: *merge_java_defaults
name: '{project-name}-{stream}-merge-properties-java'
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
- job-template:
# Job template for Java merge jobs that takes a maven template
#
@@ -815,7 +820,7 @@
name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
project-type: freestyle
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
disabled: '{disabled}'
properties:
- infra-properties:
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index b30af0e..6480daa 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -99,27 +99,11 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
-
scm:
- gerrit-trigger-scm:
refspec: ''
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- - git-extra-project:
- project: '{extra-project1}'
- refspec: '{extra-refspec1}'
- branch: '{extra-branch1}'
- checkout-dir: '{checkout-dir1}'
- - git-extra-project:
- project: '{extra-project2}'
- refspec: '{extra-refspec2}'
- branch: '{extra-branch2}'
- checkout-dir: '{checkout-dir2}'
- - git-extra-project:
- project: '{extra-project3}'
- refspec: '{extra-refspec3}'
- branch: '{extra-branch3}'
- checkout-dir: '{checkout-dir3}'
wrappers:
- infra-wrappers-docker-build:
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 1ee505f..831c770 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -18,6 +18,7 @@
name: '{project-name}-{stream}-{area}-verify-shell'
node: '{build-node}'
type: freestyle
+ concurrent: true
pattern: '**'
@@ -41,6 +42,10 @@
branch: '{branch}'
files: '{pattern}'
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
builders:
- shell: '{script}'
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 3f8816e..9b6824c 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -25,7 +25,7 @@
mvn-settings: 'holmes-common-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: holmes-common-sonar
@@ -37,7 +37,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'holmes/common'
project-name: 'holmes-common'
branch: 'master'
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index cb23377..f9c19be 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -11,7 +11,7 @@
maven-versions-plugin: true
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'holmes/engine-management'
@@ -23,7 +23,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: holmes-engine-management-sonar
@@ -35,7 +35,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'holmes/engine-management'
project-name: 'holmes-engine-management'
branch: 'master'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 7e4342b..347c6b7 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -11,7 +11,7 @@
maven-versions-plugin: true
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'holmes/rule-management'
@@ -23,7 +23,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: holmes-rule-management-sonar
@@ -35,7 +35,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'holmes/rule-management'
project-name: 'holmes-rule-management'
branch: 'master'
diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
deleted file mode 100644
index 4d0945a..0000000
--- a/jjb/include-raw-deploy-archives.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-set +e # Do not affect the build result if some part of archiving fails.
-
-# Print out git status at the end of the build before we archive if $WORKSPACE
-# is a git repo.
-if [ -d "$WORKSPACE/.git" ]; then
- echo ""
- echo "----------> Git Status Report"
- git status
-fi
-
-echo ""
-echo "----------> Archiving build to logs server"
-# Configure wget to not print download status when we download logs or when
-# Jenkins is installing Maven (To be clear this is the Jenkins Maven plugin
-# using a shell script itself that we are unable to modify directly to affect
-# wget).
-echo "verbose=off" > ~/.wgetrc
-
-ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
-[ "$LOGS_SERVER" ] || LOGS_SERVER="https://logs.onap.org"
-[ "$LOGS_REPO_URL" ] || LOGS_REPO_URL="https://nexus.onap.org/service/local/repositories/logs"
-
-echo "Build logs: <a href=\"$LOGS_SERVER/$SILO/$ARCHIVES_DIR\">$LOGS_SERVER/$SILO/$ARCHIVES_DIR</a>"
-
-mkdir .archives
-cd .archives/ || exit 1
-
-cat > deploy-archives.xml <<EOF
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>logs</groupId>
- <artifactId>logs</artifactId>
- <version>1.0.0</version>
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>maven-upload-plugin</artifactId>
- <version>0.0.1</version>
- <executions>
- <execution>
- <id>publish-site</id>
- <phase>deploy</phase>
- <goals>
- <goal>upload-file</goal>
- </goals>
- <configuration>
- <serverId>onap-log-archives</serverId>
- <repositoryUrl>$LOGS_REPO_URL/content-compressed</repositoryUrl>
- <file>archives.zip</file>
- <repositoryPath>$SILO</repositoryPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-EOF
-
-mkdir -p "$ARCHIVES_DIR"
-mkdir -p "$WORKSPACE/archives"
-if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
- pushd "$WORKSPACE"
- shopt -s globstar # Enable globstar to copy archives
- for f in $ARCHIVE_ARTIFACTS; do
- [[ -e $f ]] || continue # handle the case of no files to archive
- echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log"
- dir=$(dirname "$f")
- mkdir -p "$WORKSPACE/archives/$dir"
- mv "$f" "$WORKSPACE/archives/$f"
- done
- shopt -u globstar # Disable globstar once archives are copied
- popd
-fi
-
-
-# Ignore logging if archives doesn't exist
-mv "$WORKSPACE/archives/" "$ARCHIVES_DIR" > /dev/null 2>&1
-touch "$ARCHIVES_DIR/_build-details.txt"
-echo "build-url: ${BUILD_URL}" >> "$ARCHIVES_DIR/_build-details.txt"
-env | grep -v PASSWORD > "$ARCHIVES_DIR/_build-enviroment-variables.txt"
-
-# capture system info
-touch "$ARCHIVES_DIR/_sys-info.txt"
-{
- echo -e "uname -a:\n $(uname -a) \n"
- echo -e "df -h:\n $(df -h) \n"
- echo -e "free -m:\n $(free -m) \n"
- echo -e "nproc:\n $(nproc) \n"
- echo -e "lscpu:\n $(lscpu) \n"
- echo -e "ip addr:\n $(/sbin/ip addr) \n"
-} 2>&1 | tee -a "$ARCHIVES_DIR/_sys-info.txt"
-
-# Magic string used to trim console logs at the appropriate level during wget
-echo "-----END_OF_BUILD-----"
-wget -O "$ARCHIVES_DIR/console.log" "${BUILD_URL}consoleText"
-wget -O "$ARCHIVES_DIR/console-timestamp.log" "$BUILD_URL/timestamps?time=HH:mm:ss&appendLog"
-sed -i '/^-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console.log"
-sed -i '/^.*-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console-timestamp.log"
-
-gzip "$ARCHIVES_DIR"/*.txt "$ARCHIVES_DIR"/*.log
-# find and gzip any 'text' files
-find "$ARCHIVES_DIR" -type f -print0 \
- | xargs -0r file \
- | egrep -e ':.*text.*' \
- | cut -d: -f1 \
- | xargs -d'\n' -r gzip
-# Compress Java heap dumps using xz
-find "$ARCHIVES_DIR" -type f -name \*.hprof -print0 | xargs -0 xz
-
-zip -r archives.zip "$JENKINS_HOSTNAME/" >> "$ARCHIVES_DIR/_archives.log"
-du -sh archives.zip
diff --git a/jjb/include-update-pom-versions-not-parent.sh b/jjb/include-update-pom-versions-not-parent.sh
deleted file mode 100644
index ace2350..0000000
--- a/jjb/include-update-pom-versions-not-parent.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-## Will update POM in workspace with release version
-
-if [ ! -e version.properties ]; then
- echo "Missing version.properties"
- exit 1
-fi
-
-## will setup variable release_version
-source ./version.properties
-
-RELEASE_VERSION=$release_version
-
-echo Changing POM version to $RELEASE_VERSION
-
-## handle POM
-for file in $(find . -name pom.xml); do
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file
- if [ "$VERSION" != "" ]; then
- awk -v v=$RELEASE_VERSION '
- /<version>/ {
- if (! done) {
- sub(/<version>.*</,"<version>" v "<",$0)
- done = 1
- }
- }
- { print $0 }
- ' $file > $file.tmp
- mv $file.tmp $file
- fi
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-done
-
diff --git a/jjb/include-update-pom-versions.sh b/jjb/include-update-pom-versions.sh
deleted file mode 100644
index 2d459d0..0000000
--- a/jjb/include-update-pom-versions.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-## Will update POM in workspace with release version
-
-if [ ! -e version.properties ]; then
- echo "Missing version.properties"
- exit 1
-fi
-
-## will setup variable release_version
-source ./version.properties
-
-RELEASE_VERSION=$release_version
-
-echo Changing POM version to $RELEASE_VERSION
-
-## handle POM
-for file in $(find . -name pom.xml); do
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file
- if [ "$VERSION" != "" ]; then
- awk -v v=$RELEASE_VERSION '
- /<version>/ {
- if (! done) {
- sub(/<version>.*</,"<version>" v "<",$0)
- done = 1
- }
- }
- { print $0 }
- ' $file > $file.tmp
- mv $file.tmp $file
- fi
- if [ "$PVERSION" != "" ]; then
- awk -v v=$RELEASE_VERSION '
- /<version>/ {
- if (parent && ! done) {
- sub(/<version>.*</,"<version>" v "<",$0)
- done = 1
- }
- }
- /<parent>/ { parent = 1 }
- { print $0 }
- ' $file > $file.tmp
- mv $file.tmp $file
- fi
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-done
-
diff --git a/jjb/integration/docker/info-integration-docker.yaml b/jjb/integration/docker/info-integration-docker.yaml
deleted file mode 100644
index 071f816..0000000
--- a/jjb/integration/docker/info-integration-docker.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- project:
- name: integration-docker-onap-java11-info
- project-name: integration-docker-onap-java11
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: integration/docker/onap-java11
- branch: master
diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
new file mode 100644
index 0000000..4ad47ab
--- /dev/null
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -0,0 +1,63 @@
+---
+- project:
+ name: integration-docker-onap-java11-info
+ project-name: integration-docker-onap-java11
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/docker/onap-java11
+ branch: master
+
+- project:
+ name: integration-docker-onap-java11-linters
+ project: integration/docker/onap-java11
+ project-name: integration-docker-onap-java11
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
+
+- project:
+ name: integration-docker-onap-java11-release
+ project-name: 'integration-docker-onap-java11'
+ project: 'integration/docker/onap-java11'
+ mvn-settings: 'integration-settings'
+ jobs:
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+- project:
+ name: 'integration-docker-onap-java11-docker'
+ jobs:
+ - gerrit-docker-verify
+ - gerrit-docker-merge
+ project-name: 'integration-docker-onap-java11'
+ project: 'integration/docker/onap-java11'
+ stream:
+ - 'master':
+ branch: 'master'
+ files: ''
+ docker-name: 'onap/integration-java11'
+ docker-build-args: '-f ./Dockerfile'
+ docker-root: '$WORKSPACE'
+ mvn-settings: 'integration-settings'
+ build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml
new file mode 100644
index 0000000..505591c
--- /dev/null
+++ b/jjb/integration/docker/integration-docker-onap-python.yaml
@@ -0,0 +1,63 @@
+---
+- project:
+ name: integration-docker-onap-python-info
+ project-name: integration-docker-onap-python
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/docker/onap-python
+ branch: master
+
+- project:
+ name: integration-docker-onap-python-linters
+ project: integration/docker/onap-python
+ project-name: integration-docker-onap-python
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
+
+- project:
+ name: integration-docker-onap-python-release
+ project-name: 'integration-docker-onap-python'
+ project: 'integration/docker/onap-python'
+ mvn-settings: 'integration-settings'
+ jobs:
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+- project:
+ name: 'integration-docker-onap-python-docker'
+ jobs:
+ - gerrit-docker-verify
+ - gerrit-docker-merge
+ project-name: 'integration-docker-onap-python'
+ project: 'integration/docker/onap-python'
+ stream:
+ - 'master':
+ branch: 'master'
+ files: ''
+ docker-name: 'onap/integration-python'
+ docker-build-args: '-f ./Dockerfile'
+ docker-root: '$WORKSPACE'
+ mvn-settings: 'integration-settings'
+ build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
new file mode 100644
index 0000000..c3a2ab9
--- /dev/null
+++ b/jjb/integration/integration-docker-compose.yaml
@@ -0,0 +1,56 @@
+---
+- project:
+ name: integration-docker-compose
+ project-name: 'integration'
+ project: 'integration'
+ stream:
+ - 'master':
+ branch: 'master'
+ jobs:
+ - integration-docker-compose-verify
+ subproject:
+ - 'netconf-pnp-simulator':
+ pattern: 'test/mocks/netconf-pnp-simulator/modules/**'
+ docker_root: 'test/mocks/netconf-pnp-simulator/modules'
+ netconf_sim_service_name: 'netconf-pnp-simulator'
+ script: |
+ #!/bin/bash
+ cd $DOCKER_ROOT
+ docker-compose up -d
+ post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+ - 'emssimulator-swm-netconf':
+ pattern: 'test/mocks/emssimulator/swm-netconf/**'
+ docker_root: 'test/mocks/emssimulator/swm-netconf'
+ netconf_sim_service_name: 'ems-netconf-swm'
+ script: |
+ #!/bin/bash
+ cd $DOCKER_ROOT
+ docker-compose up -d
+ post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+ - 'pmsh-pnf-sim':
+ pattern: 'test/mocks/pmsh-pnf-sim/docker-compose/**'
+ docker_root: 'test/mocks/pmsh-pnf-sim/docker-compose'
+ netconf_sim_service_name: 'netopeer2'
+ script: |
+ #!/bin/bash
+ cd $DOCKER_ROOT
+ docker-compose up -d
+ post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+ - 'datafilecollector-testharness':
+ pattern: 'test/mocks/datafilecollector-testharness/**'
+ docker_root: 'test/mocks/datafilecollector-testharness/simulator-group'
+ script: |
+ #!/bin/bash
+ cd $DOCKER_ROOT
+ ./prepare-images.sh
+ ./docker-compose-setup.sh
+ - 'prov-mns-provider':
+ pattern: 'test/mocks/prov-mns-provider/**'
+ docker_root: 'test/mocks/prov-mns-provider'
+ script: |
+ #!/bin/bash
+ cd $DOCKER_ROOT
+ docker build . -t prov-mns-provider
+ docker-compose up -d
+ cd src
+ tox
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 1066057..b315bc4 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -3,8 +3,8 @@
name: integration-docker
project-name: 'integration'
jobs:
- - '{project-name}-{stream}-{subproject}-docker-merge'
- - '{project-name}-{stream}-{subproject}-docker-verify'
+ - integration-docker-merge
+ - integration-docker-verify
project: 'integration'
stream:
- 'master':
@@ -13,13 +13,43 @@
- 'sniroemulator':
pom: 'test/mocks/sniroemulator/pom.xml'
pattern: 'test/mocks/sniroemulator/**'
- - 'pnfsimulator':
- pom: 'test/mocks/pnfsimulator/pnfsimulator/pom.xml'
- pattern: 'test/mocks/pnfsimulator/pnfsimulator/**'
- - 'netconfsimulator':
- pom: 'test/mocks/pnfsimulator/netconfsimulator/pom.xml'
- pattern: 'test/mocks/pnfsimulator/netconfsimulator/**'
+ - 'mass-pnf-sim':
+ pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml'
+ pattern: 'test/mocks/mass-pnf-sim/**'
+ mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
+ post-docker-verify-script: |
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ cd $WORKSPACE/test/mocks/mass-pnf-sim
+ tox
mvn-settings: 'integration-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: integration-netconf-pnp-simulator
+ project: integration
+ stream:
+ - 'master':
+ branch: 'master'
+ # Required by verifier
+ mvn-settings: 'integration-settings'
+ project-name: 'integration-netconf-pnp-simulator'
+ gerrit_trigger_file_paths:
+ - compare-type: ANT
+ pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
+ docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
+ docker-root: test/mocks/netconf-pnp-simulator/engine
+ container-tag-method: yaml-file
+ post_docker_build_script: |
+ #!/bin/bash
+ set -eux
+ cd "$DOCKER_ROOT"
+ # To simplify the references inside tox.ini and tests/settings.py
+ docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+ tox
+ build-node: centos7-docker-8c-8g
+ build-timeout: 20
+ jobs:
+ - gerrit-docker-verify
+ - gerrit-docker-merge
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index aeb793f..11680b6 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -64,8 +64,14 @@
sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
vagrant plugin install vagrant-libvirt
vagrant plugin install vagrant-disksize
+ vagrant plugin install vagrant-sshfs
mkdir -p ~/.ssh
+- builder:
+ name: integration-docker-compose-logs
+ builders:
+ - shell: !include-raw: shell/docker-compose-logs.sh
+
- publisher:
name: integration-robot
publishers:
@@ -75,3 +81,16 @@
unstable-threshold: '{unstable-if}'
pass-threshold: '{pass-if}'
only-critical: false
+
+- publisher:
+ name: integration-docker-compose-logs
+ publishers:
+ - postbuildscript:
+ builders:
+ - role: BOTH
+ build-on:
+ - FAILURE
+ - SUCCESS
+ - UNSTABLE
+ build-steps:
+ - integration-docker-compose-logs
diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
new file mode 100644
index 0000000..30a3569
--- /dev/null
+++ b/jjb/integration/integration-seccom.yaml
@@ -0,0 +1,37 @@
+---
+- project:
+ name: integration-seccom-info
+ project-name: integration-seccom
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/seccom
+ branch: master
+
+- project:
+ name: integration-seccom-linters
+ project: integration/seccom
+ project-name: integration-seccom
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index a01e82f..9c2682d 100644
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -1,9 +1,11 @@
---
- job-template:
name: '{project-name}-{stream}-{subproject}-docker-merge'
+ id: integration-docker-merge
project-type: freestyle
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
docker-image-name: ''
+ mvn-goals: 'clean package docker:build docker:push'
properties:
- infra-properties:
@@ -38,7 +40,6 @@
files: '{pattern}'
builders:
-
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -48,7 +49,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean package docker:build docker:push'
+ goals: '{mvn-goals}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
@@ -63,9 +64,12 @@
- job-template:
name: '{project-name}-{stream}-{subproject}-docker-verify'
+ id: integration-docker-verify
project-type: freestyle
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
docker-image-name: ''
+ mvn-goals: 'clean package docker:build'
+ post-docker-verify-script: ''
properties:
- infra-properties:
@@ -100,7 +104,6 @@
files: '{pattern}'
builders:
-
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -110,7 +113,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean package docker:build'
+ goals: '{mvn-goals}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
@@ -118,8 +121,57 @@
properties:
- docker.pull.registry=nexus3.onap.org:10001
- docker.push.registry=nexus3.onap.org:10003
+ - shell: '{post-docker-verify-script}'
publishers:
- infra-shiplogs:
maven-version: '{maven-version}'
+- job-template:
+ name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
+ id: integration-docker-compose-verify
+ project-type: freestyle
+ description: 'This job validates Docker Compose based projects'
+ node: 'ubuntu1804-docker-8c-8g'
+ docker_root: '$WORKSPACE'
+ post_script: ''
+ netconf_sim_service_name: ''
+
+ parameters:
+ - lf-infra-parameters:
+ project: '{project}'
+ stream: '{stream}'
+ branch: '{branch}'
+
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '{pattern}'
+
+ builders:
+ - inject:
+ properties-content: |
+ DOCKER_ROOT={docker_root}
+ NETCONF_SIM_SERVICE_NAME={netconf_sim_service_name}
+ - shell: '{script}'
+ - shell: '{post_script}'
+
+ publishers:
+ - integration-docker-compose-logs
+ - lf-infra-publish
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 7d9ffed..622d523 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -44,7 +44,7 @@
publishers:
- lf-infra-publish
-- job-template:
+- job-template: &tox_verify_boilerplate
# Job template for running linters against specific file formats
#
# Required Variables:
@@ -54,6 +54,7 @@
# pattern: List of file patterns to scan
name: '{project-name}-{stream}-{subproject}-lint'
+ id: integration-linters
project-type: freestyle
description: 'Job intended for running linters with Tox and Coala'
build-node: ubuntu1804-builder-4c-4g
@@ -97,3 +98,9 @@
publishers:
- lf-infra-publish
+
+- job-template:
+ <<: *tox_verify_boilerplate
+ name: '{project-name}-{stream}-{subproject}-tox-verify'
+ id: integration-tox-verify
+ description: 'Job intended for running tox'
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 62a0bed..5b211d7 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -49,54 +49,41 @@
golangver: 'golang112'
mvn-settings: 'integration-settings'
archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
jobs:
- - '{project-name}-{stream}-{subproject}-verify-golang':
+ - '{project-name}-{stream}-{subproject}-verify-golang'
+ subproject:
+ - 'test-security-k8s':
+ path: 'test/security/k8s'
+ pattern: '{path}/**'
+ build-node: ubuntu1804-builder-4c-4g
script: |
#!/bin/bash
set -ex # Fail build if any setup step fails
cd $WORKSPACE/{path}
make test
- subproject:
- - 'test-security-k8s':
- path: 'test/security/k8s'
- pattern: '{path}/**'
- 'test-security-sslendpoints':
path: 'test/security/sslendpoints'
pattern: '{path}/**'
+ build-node: ubuntu1804-docker-8c-8g
+ script: |
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ cd $WORKSPACE/{path}
+ rm -rf $WORKSPACE/{path}/bin
+ make docker-build
+ make test
+ make clean
stream:
- 'master':
branch: 'master'
- project:
- name: integration-netconf-pnp-simulator
- project: integration
- stream:
- - 'master':
- branch: 'master'
- # Required by verifier
- mvn-settings: 'integration-settings'
- project-name: 'integration-netconf-pnp-simulator'
- gerrit_trigger_file_paths:
- - compare-type: ANT
- pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
- docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
- docker-root: test/mocks/netconf-pnp-simulator/engine
- container-tag-method: yaml-file
- post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
- build-node: centos7-docker-8c-8g
- build-timeout: 20
- jobs:
- - gerrit-docker-verify
- - gerrit-docker-merge
-
-- project:
name: integration-linters
project: 'integration'
project-name: 'integration'
python-version: python3
jobs:
- - '{project-name}-{stream}-{subproject}-lint'
+ - integration-linters
subproject:
- 'yaml':
tox-dir: '.'
@@ -114,6 +101,14 @@
tox-dir: '.'
tox-envs: 'py'
pattern: '**/*.py'
+ - 'rst':
+ tox-dir: '.'
+ tox-envs: 'rst'
+ pattern: '**/*.rst'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
stream:
- 'master':
branch: 'master'
diff --git a/jjb/integration/netconf-pnp-simulator-verify.sh b/jjb/integration/netconf-pnp-simulator-verify.sh
new file mode 100644
index 0000000..28e8ae3
--- /dev/null
+++ b/jjb/integration/netconf-pnp-simulator-verify.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Script verifies if all services in Netconf simulator's docker
+# service container were launched successfully.
+
+echo "---> netconf-pnp-simulator-verify.sh"
+
+set -e # Exit with zero only if all commands succeed
+
+DOCKER_COMPOSE_LOG="/tmp/docker-compose.log"
+DOCKER_COMPOSE_LOG_MSG=( "success:" "entered RUNNING state" )
+DOCKER_COMPOSE_SLEEP_INTERVAL=60
+
+if [ -z ${NETCONF_SIM_SERVICE_NAME} ];
+then
+ echo "ERROR: netconf-pnp-simulator service name not set."
+ exit 1
+fi
+
+pushd $DOCKER_ROOT
+
+# Dump container logs
+sleep ${DOCKER_COMPOSE_SLEEP_INTERVAL} # Hang for a while so the services settle
+docker-compose logs --no-color > ${DOCKER_COMPOSE_LOG}
+
+# Get the supervisord services running within container
+supervisord_services=($(docker-compose exec -T ${NETCONF_SIM_SERVICE_NAME} /bin/sh -c \
+ 'cat /etc/supervisord.conf /etc/supervisord.d/*' | grep -ho "program:[-a-zA-Z0-9]*" | cut -d: -f 2))
+
+# Check all services are running and fail if not
+for service in ${supervisord_services[@]};
+do
+ if ! grep -q "${DOCKER_COMPOSE_LOG_MSG[0]} $service ${DOCKER_COMPOSE_LOG_MSG[1]}" ${DOCKER_COMPOSE_LOG};
+ then
+ echo "ERROR: Service $service is not running, failing the build."
+ exit 1
+ fi
+done
diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml
new file mode 100644
index 0000000..5b07413
--- /dev/null
+++ b/jjb/integration/simulators/integration-dc-simulator.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+ name: integration-simulators-dc-simulator-info
+ project-name: integration-simulators-dc-simulator
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/simulators/dc-simulator
+ branch: master
+
+- project:
+ name: integration-simulators-dc-simulator-linters
+ project: integration/simulators/dc-simulator
+ project-name: integration-simulators-dc-simulator
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
new file mode 100644
index 0000000..481aca9
--- /dev/null
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -0,0 +1,106 @@
+---
+- project:
+ name: integration-simulators-pnf-simulator
+ project-name: integration-pnf-simulator
+ stream:
+ - 'master':
+ branch: 'master'
+ java-version: openjdk11
+ project: 'integration/simulators/pnf-simulator'
+ mvn-settings: 'integration-simulators-pnf-simulator-settings'
+ files: '**'
+ maven-deploy-properties: |
+ deployAtEnd=true
+ archive-artifacts: ''
+ build-node: ubuntu1804-docker-8c-8g
+ jobs:
+ - '{project-name}-{stream}-verify-java':
+ mvn-goals: 'clean install'
+ - '{project-name}-{stream}-merge-java':
+ mvn-goals: 'clean deploy'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: 'clean deploy'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+
+- project:
+ name: integration-simulators-pnf-simulator-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
+ cron: '@daily'
+ build-node: ubuntu1804-docker-8c-8g
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ branch: 'master'
+ mvn-settings: 'integration-simulators-pnf-simulator-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+ name: integration-simulators-pnf-simulator-info
+ project-name: integration-pnf-simulator
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/simulators/pnf-simulator
+ branch: master
+
+- project:
+ name: integration-simulators-pnf-simulator-cli
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ python-version: python3
+ jobs:
+ - integration-tox-verify
+ subproject:
+ - 'simulator-cli':
+ tox-dir: 'simulator-cli'
+ tox-envs: 'pytest'
+ pattern: '**/*'
+ stream:
+ - 'master':
+ branch: 'master'
+
+- project:
+ name: integration-simulators-pnf-simulator-linters
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'python':
+ tox-dir: '.'
+ tox-envs: 'py'
+ pattern: '**/*.py'
+ stream:
+ - 'master':
+ branch: 'master'
+
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 584d93f..895854a 100644
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -14,7 +14,7 @@
project-name: integration-simulators-ran-simulator
python-version: python3
jobs:
- - '{project-name}-{stream}-{subproject}-lint'
+ - integration-linters
subproject:
- 'yaml':
tox-dir: '.'
diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml
index fbf56a4..ce2743e 100644
--- a/jjb/integration/usecases/integration-usecases-bbs.yaml
+++ b/jjb/integration/usecases/integration-usecases-bbs.yaml
@@ -14,7 +14,7 @@
project-name: integration-usecases-bbs
python-version: python3
jobs:
- - '{project-name}-{stream}-{subproject}-lint'
+ - integration-linters
subproject:
- 'yaml':
tox-dir: '.'
diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml
new file mode 100644
index 0000000..475b271
--- /dev/null
+++ b/jjb/integration/usecases/integration-usecases-mdons.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+ name: integration-usecases-mdons-info
+ project-name: integration-usecases-mdons
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/usecases/mdons
+ branch: master
+
+- project:
+ name: integration-usecases-mdons-linters
+ project: integration/usecases/mdons
+ project-name: integration-usecases-mdons
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/integration/xtesting/info-integration-xtesting.yaml b/jjb/integration/xtesting/info-integration-xtesting.yaml
deleted file mode 100644
index babd9f6..0000000
--- a/jjb/integration/xtesting/info-integration-xtesting.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- project:
- name: integration-xtesting-info
- project-name: integration-xtesting
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: integration/xtesting
- branch: master
diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
new file mode 100644
index 0000000..2065813
--- /dev/null
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -0,0 +1,128 @@
+---
+- project:
+ name: integration-xtesting-info
+ project-name: integration-xtesting
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/xtesting
+ branch: master
+
+- project:
+ name: integration-xtesting-linters
+ project: integration/xtesting
+ project-name: integration-xtesting
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
+
+- project:
+ name: integration-xtesting-release
+ project-name: 'integration-xtesting'
+ project: 'integration/docker/onap-python'
+ mvn-settings: 'integration-settings'
+ jobs:
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+- project:
+ name: 'integration-xtesting-docker'
+ jobs:
+ - gerrit-docker-verify:
+ project-name: 'integration-xtesting-infra-healthcheck'
+ docker-root: ./infra-healthcheck
+ docker-name: 'onap/xtesting-infra-healthcheck'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-merge:
+ project-name: 'integration-xtesting-infra-healthcheck'
+ docker-root: ./infra-healthcheck
+ docker-name: 'onap/xtesting-infra-healthcheck'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-verify:
+ project-name: 'integration-xtesting-healthcheck'
+ docker-root: ./healthcheck
+ docker-name: 'onap/xtesting-healthcheck'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-merge:
+ project-name: 'integration-xtesting-healthcheck'
+ docker-root: ./healthcheck
+ docker-name: 'onap/xtesting-healthcheck'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-verify:
+ project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+ docker-root: ./smoke-usecases-pythonsdk
+ docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-merge:
+ project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+ docker-root: ./smoke-usecases-pythonsdk
+ docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-verify:
+ project-name: 'integration-xtesting-smoke-usecases-robot'
+ docker-root: ./smoke-usecases-robot
+ docker-name: 'onap/xtesting-smoke-usecases-robot'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-merge:
+ project-name: 'integration-xtesting-smoke-usecases-robot'
+ docker-root: ./smoke-usecases-robot
+ docker-name: 'onap/xtesting-smoke-usecases-robot'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-verify:
+ project-name: 'integration-xtesting-benchmarking'
+ docker-root: ./benchmarking
+ docker-name: 'onap/xtesting-benchmarking'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-merge:
+ project-name: 'integration-xtesting-benchmarking'
+ docker-root: ./benchmarking
+ docker-name: 'onap/xtesting-benchmarking'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-verify:
+ project-name: 'integration-xtesting-candidate-usecases'
+ docker-root: ./candidate-usecases
+ docker-name: 'onap/xtesting-candidate-usecases'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-merge:
+ project-name: 'integration-xtesting-candidate-usecases'
+ docker-root: ./candidate-usecases
+ docker-name: 'onap/xtesting-candidate-usecases'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-verify:
+ project-name: 'integration-xtesting-security'
+ docker-root: ./security
+ docker-name: 'onap/xtesting-security'
+ docker-build-args: '-f ./docker/Dockerfile'
+ - gerrit-docker-merge:
+ project-name: 'integration-xtesting-security'
+ docker-root: ./security
+ docker-name: 'onap/xtesting-security'
+ docker-build-args: '-f ./docker/Dockerfile'
+ project: 'integration/xtesting'
+ stream:
+ - 'master':
+ branch: 'master'
+ files: ''
+ docker-root: '$WORKSPACE'
+ mvn-settings: 'integration-settings'
+ build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
index ca2ea85..62d07a7 100644
--- a/jjb/lf-infra-releasedockerhub.yaml
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -12,7 +12,7 @@
build-timeout: 90
project-type: freestyle
- node: ubuntu1604-docker-8c-8g ## Probably don't need this much
+ node: ubuntu1804-docker-8c-8g ## Probably don't need this much
disable-job: false
disabled: '{disable-job}'
diff --git a/jjb/lf-infra-sandbox-3.yaml b/jjb/lf-infra-sandbox-3.yaml
new file mode 100644
index 0000000..6f496d5
--- /dev/null
+++ b/jjb/lf-infra-sandbox-3.yaml
@@ -0,0 +1,9 @@
+---
+- project:
+ name: sandbox-3
+ project-name: sandbox-3
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: sandbox-3
+ branch: master
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
deleted file mode 100644
index f0eab70..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- project:
- name: logging-analytics-pomba-pomba-aai-context-builder
- project-name: logging-analytics-pomba-pomba-aai-context-builder
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- maven-version: "mvn35"
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: logging-analytics/pomba/pomba-aai-context-builder
- stream:
- - 'master':
- branch: 'master'
-
- mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
- maven-version: 'mvn35'
-
-#- project:
-# name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-# project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-# jobs:
-# - '{project-name}-{stream}-docker-java-daily':
-# docker-pom: 'pom.xml'
-# mvn-profile: 'docker'
-# mvn-params: '-Dmaven.test.skip=true'
-# project: logging-analytics/pomba/pomba-aai-context-builder
-# stream:
-# - 'master':
-# branch: 'master'
-#
-# mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-# maven-version: 'mvn35'
-#
-- project:
- name: logging-analytics-pomba-pomba-aai-context-builder-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: logging-analytics/pomba/pomba-aai-context-builder
- project-name: logging-analytics-pomba-pomba-aai-context-builder
- branch: master
- mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- maven-version: 'mvn35'
-
-- project:
- name: logging-analytics-pomba-pomba-aai-context-builder-info
- 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'
-
-- project:
- name: logging-analytics-pomba-pomba-aai-context-builder-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: logging-analytics/pomba/pomba-aai-context-builder
- project-name: logging-analytics-pomba-pomba-aai-context-builder
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
deleted file mode 100644
index be776ff..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
- name: logging-analytics-pomba-pomba-audit-common
- project-name: logging-analytics-pomba-pomba-audit-common
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: logging-analytics/pomba/pomba-audit-common
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
-
-- project:
- name: logging-analytics-pomba-pomba-audit-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: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
- project: logging-analytics/pomba/pomba-audit-common
- project-name: logging-analytics-pomba-pomba-audit-common
- branch: master
- mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: logging-analytics-pomba-pomba-audit-common-info
- 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'
-
-- project:
- name: logging-analytics-pomba-pomba-audit-common-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: logging-analytics/pomba/pomba-audit-common
- project-name: logging-analytics-pomba-pomba-audit-common
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
deleted file mode 100644
index 3f4f3cb..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-- project:
- name: logging-analytics-pomba-pomba-context-aggregator
- project-name: logging-analytics-pomba-pomba-context-aggregator
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- maven-version: "mvn35"
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: logging-analytics/pomba/pomba-context-aggregator
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
- maven-version: 'mvn35'
-
-- project:
- name: logging-analytics-pomba-pomba-context-aggregator-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: logging-analytics/pomba/pomba-context-aggregator
- project-name: logging-analytics-pomba-pomba-context-aggregator
- branch: master
- mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- maven-version: 'mvn35'
-
-- project:
- name: logging-analytics-pomba-pomba-context-aggregator-info
- 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'
-
-- project:
- name: logging-analytics-pomba-pomba-context-aggregator-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: logging-analytics/pomba/pomba-context-aggregator
- project-name: logging-analytics-pomba-pomba-context-aggregator
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
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
deleted file mode 100644
index 3f064c4..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- project:
- name: logging-analytics-pomba-pomba-network-discovery-context-builder
- project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- maven-version: "mvn35"
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: logging-analytics/pomba/pomba-network-discovery-context-builder
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
- maven-version: 'mvn35'
-
-#- project:
-# name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-# project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-# jobs:
-# - '{project-name}-{stream}-docker-java-daily':
-# docker-pom: 'pom.xml'
-# mvn-profile: 'docker'
-# mvn-params: '-Dmaven.test.skip=true'
-# project: logging-analytics/pomba/pomba-network-discovery-context-builder
-# stream:
-# - 'master':
-# branch: 'master'
-# - 'casablanca':
-# branch: 'casablanca'
-# mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-# maven-version: 'mvn35'
-#
-- project:
- name: logging-analytics-pomba-pomba-network-discovery-context-builder-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: logging-analytics/pomba/pomba-network-discovery-context-builder
- project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
- branch: master
- mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- maven-version: 'mvn35'
-
-- project:
- name: logging-analytics-pomba-pomba-network-discovery-context-builder-info
- 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'
-
-- project:
- name: logging-analytics-pomba-pomba-network-discovery-context-builder-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: logging-analytics/pomba/pomba-network-discovery-context-builder
- project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
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
deleted file mode 100644
index 41855fc..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-- project:
- name: logging-analytics-pomba-pomba-sdc-context-builder
- project-name: logging-analytics-pomba-pomba-sdc-context-builder
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- maven-version: "mvn35"
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: logging-analytics/pomba/pomba-sdc-context-builder
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
- maven-version: 'mvn35'
-
-#- project:
-# name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-# project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-# jobs:
-# - '{project-name}-{stream}-docker-java-daily':
-# docker-pom: 'pom.xml'
-# mvn-profile: 'docker'
-# mvn-params: '-Dmaven.test.skip=true'
-# project: logging-analytics/pomba/pomba-sdc-context-builder
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-# maven-version: 'mvn35'
-#
-- project:
- name: logging-analytics-pomba-pomba-sdc-context-builder-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: logging-analytics/pomba/pomba-sdc-context-builder
- project-name: logging-analytics-pomba-pomba-sdc-context-builder
- branch: master
- mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- maven-version: 'mvn35'
-
-- project:
- name: logging-analytics-pomba-pomba-sdc-context-builder-info
- 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'
-
-- project:
- name: logging-analytics-pomba-pomba-sdc-context-builder-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: logging-analytics/pomba/pomba-sdc-context-builder
- project-name: logging-analytics-pomba-pomba-sdc-context-builder
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
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
deleted file mode 100644
index 90126a0..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-- project:
- name: logging-analytics-pomba-pomba-sdnc-context-builder
- project-name: logging-analytics-pomba-pomba-sdnc-context-builder
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- maven-version: "mvn35"
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: logging-analytics/pomba/pomba-sdnc-context-builder
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
-
-#- project:
-# name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-# project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-# jobs:
-# - '{project-name}-{stream}-docker-java-daily':
-# docker-pom: 'pom.xml'
-# mvn-profile: 'docker'
-# mvn-params: '-Dmaven.test.skip=true'
-# project: logging-analytics/pomba/pomba-sdnc-context-builder
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-#
-- project:
- name: logging-analytics-pomba-pomba-sdnc-context-builder-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: 'H 11 * * *'
- build-node: ubuntu1604-builder-4c-4g
- project: logging-analytics/pomba/pomba-sdnc-context-builder
- project-name: logging-analytics-pomba-pomba-sdnc-context-builder
- branch: master
- mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: logging-analytics-pomba-pomba-sdnc-context-builder-info
- 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'
-
-- project:
- name: logging-analytics-pomba-pomba-sdnc-context-builder-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: logging-analytics/pomba/pomba-sdnc-context-builder
- project-name: logging-analytics-pomba-pomba-sdnc-context-builder
- branch: 'master'
- mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 159f357..8b6c391 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -31,7 +31,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: logging-analytics-arm64
@@ -63,7 +63,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'logging-analytics'
project-name: 'logging-analytics'
branch: 'master'
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 28248e3..a2fc451 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -25,7 +25,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 8e6a8e6..e816422 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'modeling-toscaparsers-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'nfvparser':
path: 'nfvparser/'
@@ -34,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'modeling/toscaparsers'
project-name: 'modeling-toscaparsers-nfvparser'
branch: 'master'
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 3fc4d33..f4d2365 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-pom: 'distributions/msb-apigateway/pom.xml'
container-public-registry: 'nexus3.onap.org:10001'
@@ -31,7 +31,7 @@
mvn-settings: 'msb-apigateway-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: msb-apigateway-arm64
@@ -62,7 +62,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'msb/apigateway'
project-name: 'msb-apigateway'
branch: 'master'
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index cbe5505..84d75c8 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -25,7 +25,7 @@
mvn-settings: 'msb-discovery-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: msb-discovery-arm64
@@ -55,7 +55,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'msb/discovery'
project-name: 'msb-discovery'
branch: 'master'
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 9e37e17..c7bb49b 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -16,7 +16,7 @@
mvn-settings: 'msb-java-sdk-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: msb-java-sdk-sonar
@@ -28,7 +28,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'msb/java-sdk'
project-name: 'msb-java-sdk'
branch: 'master'
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 2f0c3e9..376cc1a 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -16,7 +16,7 @@
mvn-settings: 'msb-swagger-sdk-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: msb-swagger-sdk-sonar
@@ -28,7 +28,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'msb/swagger-sdk'
project-name: 'msb-swagger-sdk'
branch: 'master'
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 2995e7b..dd43c95 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -3,7 +3,7 @@
name: multicloud-k8s
project-name: 'multicloud-k8s'
path: 'src'
- golangver: 'golang112'
+ golangver: 'golang114'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-golang'
@@ -13,8 +13,11 @@
!include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
- '{project-name}-{stream}-{area}-verify-shell':
area: kud-deployment
+ build-timeout: 45
script:
!include-raw-escape: 'kud-deployment.sh'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'multicloud/k8s'
subproject:
- validation-scripts:
@@ -26,13 +29,13 @@
mvn-settings: 'multicloud-k8s-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: multicloud-k8s-arm64
# project-name: 'multicloud-k8s-arm64'
# path: 'src/k8splugin'
-# golangver: 'golang112'
+# golangver: 'golang114'
# jobs:
# - '{project-name}-{stream}-docker-golang-shell-daily':
# script:
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 2f60151..d5b0308 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -16,7 +16,7 @@
mvn-settings: 'music-distributed-kv-store-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: music-distributed-kv-store-info
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 496cd60..1450e9c 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -27,7 +27,7 @@
mvn-settings: 'music-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
index 25773fb..5f2c154 100644
--- a/jjb/music/music-mdbc.yaml
+++ b/jjb/music/music-mdbc.yaml
@@ -16,7 +16,7 @@
mvn-settings: 'music-mdbc-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 295a49e..93ffe45 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -24,7 +24,7 @@
mvn-settings: 'music-prom-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index b89c750..0d15236 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: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -27,12 +27,12 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'music-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: music-sonar
@@ -44,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'music'
project-name: 'music'
branch: 'master'
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 29d9422..5e96e18 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -2,7 +2,7 @@
- project:
name: offline-installer
project-name: 'offline-installer'
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
stream:
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 5868f9f..4b0803c 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -35,6 +35,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'dublin':
branch: 'dublin'
- 'casablanca':
diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
index 1455f7f..8defb44 100644
--- a/jjb/oom/oom-oneclick-config.yaml
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -13,7 +13,7 @@
files: '**'
archive-artifacts: ''
build-timeout: 60
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
submodule-recursive: true
jobs:
diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml
new file mode 100644
index 0000000..b43b4a0
--- /dev/null
+++ b/jjb/oom/oom-readiness.yaml
@@ -0,0 +1,61 @@
+---
+- project:
+ name: oom-readiness-info
+ project-name: oom-readiness
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: oom/readiness
+ branch: master
+
+- project:
+ name: oom-readiness-linters
+ project: oom/readiness
+ project-name: oom-readiness
+ python-version: python3
+ jobs:
+ - oom-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'py':
+ tox-dir: '.'
+ tox-envs: 'python'
+ pattern: '**/*.python'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
+
+- project:
+ name: oom-readiness-release
+ project-name: oom-readiness
+ project: oom/readiness
+ mvn-settings: 'oom-settings'
+ jobs:
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+- project:
+ name: 'oom-readiness-docker'
+ jobs:
+ - gerrit-docker-verify
+ - gerrit-docker-merge
+ project-name: 'oom-readiness'
+ project: 'oom/readiness'
+ stream:
+ - 'master':
+ branch: 'master'
+ files: ''
+ docker-name: 'onap/oom/readiness'
+ docker-build-args: '-f ./Dockerfile'
+ docker-root: '$WORKSPACE'
+ mvn-settings: 'oom-settings'
+ build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index d625aba..93fabe7 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -10,12 +10,13 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-registrator-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-pom: 'pom.xml'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-params: '-f pom.xml -Dmaven.test.skip=true -P linux,docker'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'oom/registrator'
@@ -25,7 +26,7 @@
mvn-settings: 'oom-registrator-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: oom-registrator-clm
diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml
new file mode 100644
index 0000000..3134bef
--- /dev/null
+++ b/jjb/oom/oom-templates.yaml
@@ -0,0 +1,55 @@
+---
+- job-template:
+ # Job template for running linters against specific file formats
+ #
+ # Required Variables:
+ # python-version: Python version to deploy in venv
+ # tox-env: Tox environments to run
+ # tox-dir: Directory containing the project's tox.ini
+ # pattern: List of file patterns to scan
+
+ name: '{project-name}-{stream}-{subproject}-lint'
+ id: oom-linters
+ project-type: freestyle
+ description: 'Job intended for running linters with Tox and Coala'
+ build-node: ubuntu1804-builder-4c-4g
+ node: '{build-node}'
+
+ parameters:
+ - lf-infra-parameters:
+ project: '{project}'
+ stream: '{stream}'
+ branch: '{branch}'
+ - lf-infra-tox-parameters:
+ tox-dir: '{tox-dir}'
+ tox-envs: '{tox-envs}'
+
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '{pattern}'
+
+ builders:
+ - lf-infra-tox-install:
+ python-version: '{python-version}'
+ - lf-infra-tox-run:
+ parallel: 'false'
+
+ publishers:
+ - lf-infra-publish
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index fd76da2..e6f600c 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -22,13 +22,15 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'elalto':
branch: 'elalto'
mvn-settings: 'oparent-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: oparent-clm
diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml
index b956da7..03b9be8 100644
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -25,7 +25,7 @@
concurrent: false
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
parameters:
- string:
@@ -71,7 +71,7 @@
concurrent: false
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
triggers:
- jms-messaging:
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index b4ba623..88c2384 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -10,10 +10,10 @@
project-name: 'optf-cmso'
jobs:
- gerrit-maven-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: false
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: false
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -26,13 +26,13 @@
- docker.push.registry=nexus3.onap.org:10003
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'optf/cmso'
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'optf-cmso-settings'
java-version: openjdk11
@@ -53,7 +53,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: 'H 11 * * *'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'optf/cmso'
project-name: 'optf-cmso'
branch: 'master'
@@ -70,12 +70,12 @@
nexus-iq-namespace: 'onap-'
project: optf/cmso
project-name: 'optf-cmso'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'optf-cmso-settings'
java-version: openjdk11
diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
index 9f3db13..5f4509b 100644
--- a/jjb/optf/optf-fgps.yaml
+++ b/jjb/optf/optf-fgps.yaml
@@ -21,7 +21,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -30,7 +30,7 @@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
- project:
name: optf-fgps-valetapi
@@ -50,7 +50,7 @@
- '{project-name}-{stream}-{subproject}-merge-java'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
- project:
name: optf-fgps-docker
@@ -91,7 +91,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'optf/fgps'
project-name: 'optf-fgps'
branch: 'master'
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index c657540..516ec84 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'optf-has-settings'
subproject:
- 'conductor':
@@ -66,8 +66,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'optf-has-settings'
- project:
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 2607b1f..c5a91f2 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -7,8 +7,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'optf-osdf-settings'
subproject:
- 'osdf':
@@ -67,8 +67,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'optf-osdf-settings'
- project:
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 1923c76..8d8321c 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -19,9 +19,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -31,11 +31,13 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-apex-pdp-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-apex-pdp-sonar
@@ -47,7 +49,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/apex-pdp'
project-name: 'policy-apex-pdp'
branch: 'master'
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 4c4c47d..3c95796 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-api-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 006ad3b..e3e0ce8 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-common-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 38759ff..16025c0 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -9,6 +9,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'apex-pdp'
trigger_jobs:
@@ -26,6 +28,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'distribution'
trigger_jobs:
@@ -42,6 +46,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'api'
trigger_jobs:
@@ -59,6 +65,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'xacml-pdp'
trigger_jobs:
@@ -76,6 +84,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'pap'
trigger_jobs:
@@ -92,6 +102,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'drools-pdp'
trigger_jobs:
@@ -108,6 +120,8 @@
stream:
- 'master':
branch: master
+ - 'frankfurt':
+ branch: frankfurt
functionality:
- 'drools-applications'
trigger_jobs:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 661b351..8788f5d 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -7,13 +7,13 @@
- '{project-name}-{stream}-merge-java':
docker-pom: 'pom.xml'
mvn-params: '-P docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -25,11 +25,13 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-distribution-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-distribution-sonar
@@ -41,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/distribution'
project-name: 'policy-distribution'
branch: 'master'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 5688d1f..96e9c17 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: policy-docker-base-common-elalto
+ name: policy-docker-base-common
project-name: 'policy-docker'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -8,9 +8,9 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: "-P docker"
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -20,15 +20,15 @@
project: 'policy/docker'
stream:
- - 'elalto':
- branch: 'elalto'
+ - 'master':
+ branch: 'master'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
- name: policy-docker-base-common
+ name: policy-docker-base-common-frankfurt
project-name: 'policy-docker'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -37,7 +37,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
pattern: 'do_not_match_any_file'
- '{project-name}-{stream}-merge-java':
project-name: 'policy-docker-arm64'
@@ -60,7 +60,7 @@
pattern: 'do_not_match_any_file'
- gerrit-maven-docker-stage:
project-name: 'policy-docker-amd64'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
container-public-registry: 'docker.io'
@@ -70,19 +70,19 @@
- compare-type: REG_EXP
pattern: 'do_not_match_any_file'
- '{project-name}-docker-manifest-{stream}':
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-multiarch-docker-stage-{stream}'
# - '{project-name}-gerrit-release-jobs':
# build-node: centos7-docker-8c-8g
project: 'policy/docker'
stream:
- - 'master':
- branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-docker-clm
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7935f33..166f5ca 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -13,9 +13,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -25,11 +25,14 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-drools-applications-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
+
- project:
name: policy-drools-applications-sonar
@@ -41,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/drools-applications'
project-name: 'policy-drools-applications'
branch: 'master'
@@ -60,7 +63,7 @@
branch: 'master'
mvn-settings: 'policy-drools-applications-settings'
java-version: openjdk11
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-drools-applications-info
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 25b45e0..cc056ce 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -13,9 +13,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -25,11 +25,13 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-drools-pdp-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-drools-pdp-sonar
@@ -41,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/drools-pdp'
project-name: 'policy-drools-pdp'
branch: 'master'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 0ebc274..64ba91e 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -13,9 +13,9 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -23,13 +23,13 @@
project: 'policy/engine'
stream:
- - 'master':
- branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-engine-settings'
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: policy-engine-sonar
@@ -41,10 +41,10 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/engine'
project-name: 'policy-engine'
- branch: 'master'
+ branch: 'frankfurt'
mvn-settings: 'policy-engine-settings'
java-version: openjdk11
mvn-goals: 'clean install'
@@ -58,10 +58,10 @@
nexus-iq-namespace: 'onap-'
project: policy/engine
project-name: 'policy-engine'
- branch: 'master'
+ branch: 'frankfurt'
mvn-settings: 'policy-engine-settings'
java-version: openjdk11
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
- project:
name: policy-engine-info
@@ -70,4 +70,4 @@
- gerrit-info-yaml-verify
build-node: centos7-builder-2c-1g
project: policy/engine
- branch: master
+ branch: frankfurt
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index fc57249..862c040 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -7,19 +7,21 @@
- '{project-name}-{stream}-merge-java':
docker-pom: 'pom.xml'
mvn-params: '-P docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ disabled: true
- '{project-name}-gerrit-release-jobs':
build-node: centos7-builder-4c-4g
+ disabled: true
project: 'policy/gui'
stream:
@@ -29,7 +31,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-gui-sonar
@@ -41,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/gui'
project-name: 'policy-gui'
branch: 'master'
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 0b9e637..a3a7b31 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-models-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 75c9e22..3bf16e6 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-pap-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 7901d4f..8d803fa 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-parent-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index a4982aa..4607aec 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -25,6 +25,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'policy-xacml-pdp-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 43b56a9..dca6674 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -24,12 +24,12 @@
stream:
- 'master':
branch: 'master'
- - 'release-2.6.0':
- branch: 'release-2.6.0'
+ - 'release-3.2.0':
+ branch: 'release-3.2.0'
mvn-settings: 'portal-sdk-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: portal-sdk-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'portal/sdk'
project-name: 'portal-sdk'
branch: 'master'
@@ -56,7 +56,7 @@
- gerrit-maven-clm:
mvn-params: '-f ecomp-sdk/pom.xml'
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: portal/sdk
project-name: 'portal-sdk'
branch: 'master'
diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index a45188d..04a6374 100644
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -17,10 +17,12 @@
stream:
- 'master':
branch: 'master'
+ - 'release-3.2.0':
+ branch: 'release-3.2.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
extra-project: 'portal/sdk'
extra-branch: '{branch}'
extra-refspec: 'refs/heads/{branch}'
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index fa76df1..325d79a 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -21,10 +21,12 @@
stream:
- 'master':
branch: 'master'
+ - 'release-3.2.0':
+ branch: 'release-3.2.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER
- project:
@@ -37,7 +39,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'portal'
project-name: 'portal'
branch: 'master'
@@ -51,7 +53,7 @@
- 'onap-gerrit-maven-coverity'
cron: '@daily'
max-git-repo-age-hours: 48
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
project: 'portal'
project-name: 'portal'
branch: 'master'
@@ -88,7 +90,7 @@
project: portal
project-name: 'portal'
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-settings: 'portal-settings'
- project:
diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index ae02400..bd2f1d4 100644
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -DskipTests=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -58,7 +58,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/dcae-d/ci'
project-name: 'sdc-dcae-d-ci'
branch: 'master'
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index eebb04d..3127610 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -DskipTests=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
files: '**'
archive-artifacts: ''
@@ -55,7 +57,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/dcae-d/dt-be-main'
project-name: '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 8762c08..7180195 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -28,7 +28,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/dcae-d/dt-be-property'
project-name: 'sdc-dcae-d-dt-be-property'
branch: 'master'
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 6531c54..22117c7 100644
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -11,7 +11,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P server,docker -DskipTests=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -23,6 +23,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'sdc-dcae-d-dt-settings'
files: '**'
archive-artifacts: ''
@@ -57,7 +59,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/dcae-d/dt'
project-name: 'sdc-dcae-d-dt'
branch: 'master'
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index f5693cb..fcd7d51 100644
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -11,7 +11,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -DskipTests=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -23,6 +23,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'sdc-dcae-d-fe-settings'
files: '**'
archive-artifacts: ''
@@ -56,7 +58,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/dcae-d/fe'
project-name: '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 54fd898..1165d58 100644
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -11,11 +11,11 @@
path: '.'
pattern: '**'
mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P default -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -54,7 +54,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'sdc/dcae-d/tosca-lab'
project-name: 'sdc-dcae-d-tosca-lab'
branch: 'master'
diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml
index cf843d6..0aad248 100644
--- a/jjb/sdc/sdc-microservices.yaml
+++ b/jjb/sdc/sdc-microservices.yaml
@@ -45,7 +45,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/microservices'
project-name: 'sdc-microservices'
branch: 'master'
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index f3cf944..ef6ff5a 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -40,7 +40,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/onap-ui-angular'
project-name: 'sdc-onap-ui-angular'
branch: 'master'
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index d2f5806..7f6689f 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -34,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/onap-ui-common'
project-name: 'sdc-onap-ui-common'
branch: 'master'
diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml
index bac85d2..45b9792 100644
--- a/jjb/sdc/sdc-onap-ui-react.yaml
+++ b/jjb/sdc/sdc-onap-ui-react.yaml
@@ -34,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/onap-ui-react'
project-name: 'sdc-onap-ui-react'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index b9e51a6..487967d 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -39,7 +39,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/sdc-be-common'
project-name: 'sdc-sdc-be-common'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index f509791..7250a84 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/sdc-distribution-client'
project-name: 'sdc-sdc-distribution-client'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index c0d7964..57726b7 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -8,11 +8,11 @@
build-node: 'ubuntu1804-docker-v1-8c-8g'
docker-pom: 'pom.xml'
- '{project-name}-{stream}-sdc-merge-java':
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P default'
container-public-registry: 'nexus3.onap.org:10001'
@@ -26,7 +26,7 @@
mvn-settings: 'sdc-sdc-docker-base-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-4c-4g
maven-version: 'mvn35'
#- project:
@@ -34,7 +34,7 @@
# project-name: 'sdc-sdc-docker-base-arm64'
# jobs:
# - '{project-name}-{stream}-sdc-merge-java':
-# build-node: 'ubuntu1604-docker-8c-8g'
+# build-node: 'ubuntu1804-docker-8c-8g'
# docker-pom: 'pom.xml'
# mvn-profile: 'default'
# project: 'sdc/sdc-docker-base'
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 7856426..adaa2d5 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -34,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/sdc-pubsub'
project-name: 'sdc-sdc-pubsub'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 798a7a6..51d91ee 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/sdc-tosca'
project-name: 'sdc-sdc-tosca'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index b2d42b9..9c2d057 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -30,12 +30,14 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
maven-version: 'mvn35'
#- project:
@@ -66,7 +68,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdc/sdc-workflow-designer'
project-name: 'sdc-sdc-workflow-designer'
branch: 'master'
@@ -82,7 +84,7 @@
nexus-iq-namespace: 'onap-'
project: sdc/sdc-workflow-designer
project-name: 'sdc-sdc-workflow-designer'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index f17fd1a..862447a 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -55,11 +55,13 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'sdc-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-8c-8g
- maven-version: 'mvn35'
+ build-node: ubuntu1804-docker-8c-8g
+ maven-version: 'mvn36'
#- project:
# name: sdc-arm64
@@ -90,7 +92,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'sdc'
project-name: 'sdc'
branch: 'master'
@@ -109,7 +111,7 @@
nexus-iq-namespace: 'onap-'
project: sdc
project-name: 'sdc-catalog'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
branch: 'master'
mvn-settings: 'sdc-settings'
@@ -123,7 +125,7 @@
nexus-iq-namespace: 'onap-'
project: sdc
project-name: 'sdc-onboarding'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
branch: 'master'
mvn-settings: 'sdc-settings'
@@ -139,7 +141,7 @@
- project:
name: 'sdc-whitesource'
project-name: 'sdc'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan:
build-timeout: 120
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 1b2f567..0b04a27 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -17,7 +17,7 @@
build-node: centos7-builder-4c-4g
cron: ''
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -42,7 +42,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -56,7 +56,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdnc/apps'
project-name: 'sdnc-apps'
branch: 'master'
@@ -90,7 +90,7 @@
nexus-iq-namespace: 'onap-'
project: sdnc/apps
project-name: 'sdnc-apps'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
stream:
- 'master':
branch: 'master'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index e41fef9..ee7c79d 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -29,7 +29,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -43,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'sdnc/northbound'
project-name: 'sdnc-northbound'
branch: 'master'
@@ -59,7 +59,7 @@
nexus-iq-namespace: 'onap-'
project: sdnc/northbound
project-name: 'sdnc-northbound'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
stream:
- 'master':
branch: 'master'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index e028ff8..428251a 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -13,7 +13,7 @@
maven-versions-plugin: true
cron: ''
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -26,13 +26,15 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'sdnc-oam-settings'
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
shallow-clone: true
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -62,7 +64,7 @@
nexus-iq-namespace: 'onap-'
project: sdnc/oam
project-name: 'sdnc-oam'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
stream:
- 'master':
branch: 'master'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 8b8b052..c6d9ab5 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'so/libs'
project-name: 'so-libs'
branch: 'master'
diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
new file mode 100644
index 0000000..b1b3f54
--- /dev/null
+++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
@@ -0,0 +1,45 @@
+---
+- project:
+ name: testsuite-pythonsdk-tests-info
+ project-name: testsuite-pythonsdk-tests
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: testsuite/pythonsdk-tests
+ branch: master
+
+- project:
+ name: testsuite-pythonsdk-tests-linters
+ project: 'testsuite/pythonsdk-tests'
+ project-name: 'testsuite-pythonsdk-tests'
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ - 'python':
+ tox-dir: '.'
+ tox-envs: 'py'
+ pattern: '**/*.py'
+ - 'rst':
+ tox-dir: '.'
+ tox-envs: 'rst'
+ pattern: '**/*.rst'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
new file mode 100644
index 0000000..7a4ad4d
--- /dev/null
+++ b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: testsuite-robot-utils-project-view
+ project-name: testsuite-robot-utils
+ views:
+ - project-view
+
+- project:
+ name: testsuite-robot-utils-info
+ project: testsuite/robot-utils
+ project-name: testsuite-robot-utils
+ build-node: centos7-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
index 2c46a15..77f8cb5 100644
--- a/jjb/testsuite/testsuite-heatbridge.yaml
+++ b/jjb/testsuite/testsuite-heatbridge.yaml
@@ -23,7 +23,7 @@
mvn-settings: 'testsuite-heatbridge-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: testsuite-heatbridge-master-clm
@@ -32,7 +32,7 @@
nexus-iq-namespace: 'onap-'
project: testsuite/heatbridge
project-name: 'testsuite-heatbridge'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'testsuite-heatbridge-settings'
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 7d0eb5d..cb70a08 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -24,26 +24,9 @@
project: 'testsuite'
- extra-project1: 'testsuite/python-testing-utils'
- extra-branch1: '{branch}'
- extra-refspec1: 'refs/heads/{branch}'
- checkout-dir1: 'testsuite/eteutils'
-
- extra-project2: 'testsuite/heatbridge'
- extra-branch2: '{branch}'
- extra-refspec2: 'refs/heads/{branch}'
- checkout-dir2: 'testsuite/heatbridge'
-
- extra-project3: 'demo'
- extra-branch3: '{branch}'
- extra-refspec3: 'refs/heads/{branch}'
- checkout-dir3: 'demo'
-
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
- 'elalto':
branch: 'elalto'
mvn-settings: 'testsuite-settings'
@@ -63,7 +46,7 @@
project-name: 'testsuite'
python-version: python3
jobs:
- - '{project-name}-{stream}-{subproject}-lint'
+ - integration-linters
subproject:
- 'yaml':
tox-dir: '.'
diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml
deleted file mode 100644
index e4e112f..0000000
--- a/jjb/usecases/5G-bulkpm.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: usecases-5G-bulkpm-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'usecases'
- recipients: 'morgan.richomm@orange.com bf1936@att.com rajendra.jaiswal@ericsson.com liam.burke@ericsson.com'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - '5G-bulkpm':
- trigger_jobs:
- - '{project-name}-{stream}-docker-java-shell-daily'
- robot-options: ''
diff --git a/jjb/usecases/config-over-netconf.yaml b/jjb/usecases/config-over-netconf.yaml
deleted file mode 100644
index 27491d1..0000000
--- a/jjb/usecases/config-over-netconf.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: usecases-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'usecases'
- recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech eric.e.moore@est.tech raj.gumma@ericsson.com'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'config-over-netconf':
- trigger_jobs:
- - '{project-name}-{stream}-docker-java-shell-daily'
- robot-options: ''
diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
new file mode 100644
index 0000000..8e70983
--- /dev/null
+++ b/jjb/usecases/usecases-csit.yaml
@@ -0,0 +1,49 @@
+---
+- project:
+ name: usecases-5G-bulkpm-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'usecases-5G-bulkpm'
+ recipients: 'morgan.richomm@orange.com bf1936@att.com lego@est.tech'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - '5G-bulkpm':
+ trigger_jobs:
+ - '{project-name}-{stream}-docker-java-shell-daily'
+ robot-options: ''
+
+- project:
+ name: usecases-pnf-sw-upgrade
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'usecases-pnf-sw-upgrade'
+ recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'pnf-sw-upgrade':
+ trigger_jobs:
+ - '{project-name}-{stream}-docker-java-shell-daily'
+ robot-options: ''
+
+- project:
+ name: usecases-config-over-netconf
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'usecases-config-over-netconf'
+ recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'config-over-netconf':
+ trigger_jobs:
+ - '{project-name}-{stream}-docker-java-shell-daily'
+ robot-options: ''
+
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 917ff29..a4241e7 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -17,14 +17,14 @@
maven-versions-plugin: true
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: usecase-ui-server-sonar
@@ -36,7 +36,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'usecase-ui/server'
project-name: 'usecase-ui-server'
branch: 'master'
@@ -51,7 +51,7 @@
nexus-iq-namespace: 'onap-'
project: usecase-ui/server
project-name: 'usecase-ui-server'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'usecase-ui-server-settings'
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index cc1a04b..4965f82 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -22,14 +22,14 @@
maven-versions-plugin: true
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: usecase-ui-clm
@@ -38,7 +38,7 @@
nexus-iq-namespace: 'onap-'
project: usecase-ui
project-name: 'usecase-ui'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'usecase-ui-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index b93bf60..e05273b 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -29,7 +29,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 4412d09..1445f9b 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -23,12 +23,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-gvnfm-vnfmgr-mgr-sonar
@@ -41,7 +41,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f mgr/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/gvnfm/vnfmgr'
project-name: 'vfc-gvnfm-vnfmgr-mgr'
branch: 'master'
@@ -56,7 +56,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/gvnfm/vnfmgr
project-name: 'vfc-gvnfm-vnfmgr'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index 6c9afed..2bb891b 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'mgr':
path: 'mgr'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 8fbf442..6551d45 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -24,12 +24,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-gvnfm-vnfres-res-sonar
@@ -42,7 +42,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f res/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/gvnfm/vnfres'
project-name: 'vfc-gvnfm-vnfres-res'
branch: 'master'
@@ -57,7 +57,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/gvnfm/vnfres
project-name: 'vfc-gvnfm-vnfres'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfres-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index f172330..5bdf8e4 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfres-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'res':
path: 'res'
diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
deleted file mode 100644
index cb43838..0000000
--- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: vfc-nfvo-catalog-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-nfvo-catalog'
- recipients: 'yangyanyj@chinamobile.com'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index e12807d..0e46c40 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -25,7 +25,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 87c4907..679cc45 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -7,7 +7,7 @@
stream:
- 'master':
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-db-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index b79fdcc..85e9d68 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -24,12 +24,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-driver-ems-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-ems-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/ems'
project-name: 'vfc-nfvo-driver-ems'
branch: 'master'
@@ -56,7 +56,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/ems
project-name: 'vfc-nfvo-driver-ems'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-ems-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 5130e9c..407a615 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -25,12 +25,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-driver-zte-sfc-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-sfc-sonar
@@ -43,7 +43,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f zte/sfc-driver/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/sfc'
project-name: 'vfc-nfvo-driver-sfc'
branch: 'master'
@@ -58,7 +58,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/sfc
project-name: 'vfc-nfvo-driver-sfc'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-sfc-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 19cf0b4..f878452 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -24,7 +24,7 @@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-svnfm-huawei-sonar
@@ -36,7 +36,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-params: '-f huawei/pom.xml'
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-svnfm-huawei'
@@ -53,7 +53,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/svnfm
project-name: 'vfc-nfvo-driver-svnfm-huawei'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 95a4dee..db89aff 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -26,12 +26,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
@@ -44,7 +44,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f gvnfmadapter/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/gvnfm'
project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
branch: 'master'
@@ -59,7 +59,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/gvnfm
project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
index 0990efb..0f56d0c 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
@@ -17,7 +17,7 @@
- '{project-name}-{stream}-{subproject}-merge-java'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-juju-sonar
@@ -29,7 +29,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-params: '-f juju/juju-vnfmadapter/pom.xml'
project: 'vfc/nfvo/driver/vnfm/gvnfm'
project-name: 'vfc-nfvo-driver-vnfm-gvnfm-juju'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index 2552386..0cad04b 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'gvnfmadapter':
path: 'gvnfmadapter'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
index 6807afa..ac6138a 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -14,8 +14,8 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index 193df51..88607eb 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -24,7 +24,7 @@
build-node: centos7-docker-8c-8g
files: 'nokiav2/**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker
@@ -64,7 +64,7 @@
docker_registry: '$DOCKER_REGISTRY:10003'
files: 'nokiav2/**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
@@ -83,7 +83,7 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm
@@ -93,6 +93,6 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/svnfm
project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index d97ec98..52aee73 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -13,7 +13,7 @@
mvn-params: '-P rootOnly'
pattern: 'pom.xml'
- '{project-name}-{stream}-merge-profile-java':
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
pattern: 'pom.xml'
- gerrit-maven-stage:
sign-artifacts: true
@@ -21,7 +21,7 @@
maven-versions-plugin: true
mvn-params: '-P rootOnly'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-svnfm-root-info
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 13f5945..db2b6bb 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -24,7 +24,7 @@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
@@ -37,7 +37,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f zte/vmanager/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
branch: 'master'
@@ -53,6 +53,6 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/svnfm
project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
index 39d7eb8..5c77ac2 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'drv-vnfm-zte':
path: 'zte/vmanager'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index ff6c94b..fd848c5 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -19,7 +19,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
files: '**'
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index d9601cb..16866a8 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -7,7 +7,7 @@
stream:
- 'master':
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -34,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/multivimproxy'
project-name: 'vfc-nfvo-multivimproxy'
branch: 'master'
@@ -49,7 +49,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/multivimproxy
project-name: 'vfc-nfvo-multivimproxy'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-multivimproxy-settings'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 35992f8..b162ab8 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -7,7 +7,7 @@
stream:
- 'master':
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -34,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/resmanagement'
project-name: 'vfc-nfvo-resmanagement'
branch: 'master'
@@ -49,7 +49,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/resmanagement
project-name: 'vfc-nfvo-resmanagement'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-resmanagement-settings'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 4d650c3..ca51fc3 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -27,7 +27,7 @@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-wfengine-engine-mgr-service-stage
@@ -53,7 +53,7 @@
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-wfengine-engine-activiti-extension-stage
@@ -79,7 +79,7 @@
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
@@ -92,7 +92,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
mvn-params: '-f wfenginemgrservice/pom.xml'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/wfengine'
project-name: 'vfc-nfvo-wfengine-wfenginemgrservice'
branch: 'master'
@@ -110,7 +110,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
mvn-params: '-f activiti-extension/pom.xml'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/wfengine'
project-name: 'vfc-nfvo-wfengine-activiti-extension'
branch: 'master'
@@ -125,7 +125,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/wfengine
project-name: 'vfc-nfvo-wfengine'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-wfengine-settings'
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index c300a50..6f734e5 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -9,8 +9,6 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
functionality:
- 'healthCheck':
trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 871876e..75da082 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -27,12 +27,12 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'vid-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: vid-docker-arm64
@@ -60,7 +60,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vid'
project-name: 'vid'
branch: 'master'
@@ -75,7 +75,7 @@
nexus-iq-namespace: 'onap-'
project: vid
project-name: 'vid'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vid-settings'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 291011c..5c7716f 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -21,7 +21,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
@@ -31,7 +31,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
#- project:
# name: vnfsdk-dovetail-integration-arm64
# project-name: 'vnfsdk-dovetail-integration-arm64'
@@ -56,7 +56,7 @@
jobs:
- gerrit-tox-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/dovetail-integration'
project-name: 'vnfsdk-dovetail-integration'
branch: 'master'
@@ -80,6 +80,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/dovetail-integration
project-name: 'vnfsdk-dovetail-integration'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 3a29d41..57e12fc 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -17,7 +17,7 @@
mvn-settings: 'vnfsdk-functest-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-functest-sonar
@@ -29,7 +29,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/functest'
project-name: 'vnfsdk-functest'
branch: 'master'
@@ -53,6 +53,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/functest
project-name: 'vnfsdk-functest'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-functest-settings'
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index 7b2a773..6d22310 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -14,7 +14,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vnfsdk-pkgtools-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{subproject}-python-staging-{stream}'
@@ -25,7 +25,7 @@
jobs:
- gerrit-tox-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/pkgtools'
project-name: 'vnfsdk-pkgtools'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 58a45d1..d435641 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -10,10 +10,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-f vnfmarket-be/deployment/docker/docker-refrepo/pom.xml -P docker -Dmaven.test.skip=true'
- mvn-pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
+ mvn-goals: 'clean package -Pdocker'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -22,7 +21,7 @@
# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
# mvn-profile: 'docker'
# mvn-params: '-Dmaven.test.skip=true'
-# build-node: ubuntu1604-docker-8c-8g
+# build-node: ubuntu1804-docker-8c-8g
project: 'vnfsdk/refrepo'
stream:
- 'master':
@@ -30,7 +29,7 @@
mvn-settings: 'vnfsdk-refrepo-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: vnfsdk-refrepo-arm64
@@ -63,7 +62,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/refrepo'
project-name: 'vnfsdk-refrepo'
branch: 'master'
@@ -87,6 +86,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/refrepo
project-name: 'vnfsdk-refrepo'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-refrepo-settings'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index f5e7f43..3d5a602 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -18,7 +18,7 @@
mvn-settings: 'vnfsdk-validation-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-validation-sonar
@@ -30,7 +30,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/validation'
project-name: 'vnfsdk-validation'
branch: 'master'
@@ -54,6 +54,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/validation
project-name: 'vnfsdk-validation'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-validation-settings'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index b0a6a2c..7d41914 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -31,7 +31,7 @@
mvn-settings: 'vnfsdk-ves-agent-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-ves-agent-sonar
@@ -54,7 +54,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/ves-agent'
project-name: 'vnfsdk-ves-agent'
branch: 'master'
@@ -80,6 +80,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/ves-agent
project-name: 'vnfsdk-ves-agent'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-ves-agent-settings'
diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh
index ef6fedc..f17b3db 100644
--- a/jjb/vvp/pre-build-csv.sh
+++ b/jjb/vvp/pre-build-csv.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-virtualenv -p python3.6 $WORKSPACE/venv-tox
+python3 -m venv $WORKSPACE/venv-tox
source $WORKSPACE/venv-tox/bin/activate
pip3 install --upgrade pip
pip3 install --no-use-pep517 -r requirements.txt
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 9e2cc94..9f9b85e 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-validation-scripts-settings'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily':
@@ -32,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'vvp/validation-scripts'
project-name: 'vvp-validation-scripts'
branch: 'master'
@@ -44,7 +44,7 @@
name: vvp-validation-scripts-tracability-matrix
project: 'vvp/validation-scripts'
project-name: 'vvp-validation-scripts'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'vvp-validation-scripts-settings'
mvn-global-settings: 'global-settings'
stream:
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index daed681..daecffe 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,8 +6,8 @@
become_method: sudo
vars:
- kubectl_version: 1.11.2
- helm_version: 2.12.3
+ kubectl_version: 1.15.11
+ helm_version: 2.16.6
tasks:
- name: 'Install kubectl {{kubectl_version}}'
@@ -36,4 +36,3 @@
command: 'which helm'
- name: 'Check kubectl.'
command: 'which kubectl'
-
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 162ac3f..3460981 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -14,7 +14,7 @@
- name: Update and upgrade apt packages
apt:
- upgrade: yes
+ upgrade: 'yes'
update_cache: yes
become: true
when: ansible_distribution == 'Ubuntu'
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 5811270..0948cd0 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -79,7 +79,7 @@
- name: Update and upgrade apt packages
apt:
- upgrade: yes
+ upgrade: 'yes'
update_cache: yes
become: true
when: ansible_distribution == 'Ubuntu'
diff --git a/shell/docker-compose-logs.sh b/shell/docker-compose-logs.sh
new file mode 100644
index 0000000..87bcd69
--- /dev/null
+++ b/shell/docker-compose-logs.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Dump Docker Compose info
+
+set +e # Do not fail build if any of script command fails
+set -x
+
+echo "---> docker-compose-logs.sh"
+
+cd $DOCKER_ROOT
+docker-compose config
+docker-compose ps
+docker-compose top
+docker-compose images
+
+# Do not fail build if script fails.
+exit 0