Merge "Add linter verify jobs for 'demo' project"
diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 8efdb43..3b4f67b 100644
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -12,7 +12,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
mvn-goals: 'clean install'
@@ -26,7 +26,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 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/certservice'
project-name: 'aaf-certservice'
branch: 'master'
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 9a2c190..8a3f8e8 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -19,7 +19,7 @@
mvn-settings: 'appc-cdt-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: appc-cdt-clm
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index ee14b23..4fdbb66 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -17,7 +17,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: appc-deployment-docker
@@ -28,7 +28,7 @@
- 'docker-version-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-versions-plugin: true
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
@@ -45,7 +45,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
#- project:
# name: appc-deployment-arm64-docker
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index dd7353f..404fe9e 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-builder-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-builder-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- gerrit-maven-stage:
@@ -30,7 +30,7 @@
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: appc-sonar
@@ -42,7 +42,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-8c-8g
project: 'appc'
project-name: 'appc'
branch: 'master'
@@ -57,7 +57,7 @@
- gerrit-maven-clm:
mvn-params: '-DskipTests'
build-timeout: 60
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
nexus-iq-namespace: 'onap-'
project: 'appc'
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..218bd2b 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'
@@ -33,7 +33,7 @@
maven-version: "mvn35"
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -68,7 +68,7 @@
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'ccsdk-distribution-settings'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
@@ -83,7 +83,7 @@
- project:
name: ccsdk-distribution-whitesource
project-name: ccsdk-distribution
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-8c-8g
jobs:
- gerrit-whitesource-scan:
java-opts: '-Xmx2048m'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 0a0120e..d5fb682 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,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'ccsdk/features'
project-name: 'ccsdk-features'
branch: 'master'
@@ -66,7 +66,7 @@
branch: 'frankfurt'
mvn-settings: 'ccsdk-features-settings'
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: ccsdk-features-info
@@ -79,7 +79,7 @@
- project:
name: ccsdk-features-whitesource
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-builder-8c-8g
project-name: ccsdk-features
jobs:
- gerrit-whitesource-scan
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/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 8b65dc8..0f2f046 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-8c-8g
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/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index dae2418..b148414 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'
@@ -37,7 +37,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: clamp-sonar
@@ -50,7 +50,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'clamp'
project-name: 'clamp'
branch: 'master'
@@ -69,7 +69,7 @@
project-name: 'clamp'
branch: 'master'
mvn-settings: 'clamp-settings'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
build-timeout: 120
java-version: openjdk11
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/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 0b97d5a..4c626e9 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -13,7 +13,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
- '{project-name}-{stream}-merge-java':
@@ -21,11 +21,14 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean deploy docker:build -DpushImage'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
-
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-docker-8c-8g
+ maven-versions-plugin: true
- project:
name: dcaegen2-analytics-tca-gen2-sonar
jobs:
@@ -36,7 +39,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/analytics/tca-gen2'
project-name: 'dcaegen2-analytics-tca-gen2'
branch: 'master'
@@ -50,7 +53,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/analytics/tca-gen2
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-analytics-tca-gen2'
branch: 'master'
mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 733f9c4..3231fae 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -13,7 +13,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-maven-stage:
sign-artifacts: true
@@ -22,7 +22,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/datafile'
project-name: 'dcaegen2-collectors-datafile'
branch: 'master'
@@ -55,7 +55,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/datafile
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-datafile'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-datafile-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index a171bde..d6f7b87 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -14,7 +14,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
mvn-goals: 'clean install'
@@ -28,7 +28,7 @@
maven-versions-plugin: true
mvn-goals: 'clean deploy -Ddocker.skip'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -44,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/hv-ves'
project-name: 'dcaegen2-collectors-hv-ves'
branch: 'master'
@@ -61,7 +61,7 @@
project: dcaegen2/collectors/hv-ves
project-name: 'dcaegen2-collectors-hv-ves'
branch: 'master'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 72c5a55..e06ca9e 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'
@@ -29,7 +29,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-collectors-restconf-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/restconf'
project-name: 'dcaegen2-collectors-restconf'
branch: 'master'
@@ -55,7 +55,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/restconf
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-restconf'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index b94302f..a586372 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -21,7 +21,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-collectors-snmptrap-sonar
@@ -33,7 +33,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/collectors/snmptrap'
project-name: 'dcaegen2-collectors-snmptrap'
branch: 'master'
@@ -47,7 +47,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/snmptrap
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-snmptrap'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 43201bd..eba5e39 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'
@@ -30,7 +30,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-collectors-ves-sonar
@@ -43,7 +43,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/collectors/ves'
project-name: 'dcaegen2-collectors-ves'
branch: 'master'
@@ -57,7 +57,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/ves
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-ves'
branch: 'master'
mvn-settings: 'dcaegen2-collectors-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index d31538d..e1eda94 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -28,7 +28,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: dcaegen2/deployments
project-name: 'dcaegen2-deployments'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 450bd4f..8ea96a6 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -20,7 +20,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-blueprints-clm
@@ -28,7 +28,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/blueprints
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-blueprints'
branch: 'master'
mvn-settings: 'dcaegen2-platform-blueprints-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 78d12ee..2203fe7 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:
@@ -34,7 +34,7 @@
project: dcaegen2/platform/configbinding
project-name: dcaegen2-platform-configbinding
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
# Sonar jobs use maven to push report
mvn-settings: dcaegen2-platform-configbinding-settings
mvn-goals: 'clean test'
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index c03f0d2..fdc6fa4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -20,7 +20,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-deployment-handler-clm
@@ -28,7 +28,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/deployment-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-deployment-handler'
branch: 'master'
mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 685582e..44c5bf7 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
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 6f97d6f..f368dae 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'
@@ -29,7 +29,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-inventory-api-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform/inventory-api'
project-name: 'dcaegen2-platform-inventory-api'
branch: 'master'
@@ -55,7 +55,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/inventory-api
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-inventory-api'
branch: 'master'
mvn-settings: 'dcaegen2-platform-inventory-api-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index 855be90..dc48e74 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -27,4 +27,4 @@
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..e84e83e 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.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:
@@ -27,7 +27,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-mod-designtool'
branch: 'master'
mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index f3ad499..dea3938 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.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-mod-genprocessor-sonar
@@ -30,7 +30,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: 'dcaegen2-platform-mod-genprocessor'
branch: 'master'
@@ -44,7 +44,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-mod-genprocessor-clm
mvn-params: '-f mod/genprocessor/pom.xml'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index cdfd3c6..3e5a85c 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.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-mod-runtimeapi-sonar
@@ -30,7 +30,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: 'dcaegen2-platform-mod-runtimeapi'
branch: 'master'
@@ -44,7 +44,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-mod-runtimeapi-clm
mvn-params: '-f mod/runtimeapi/pom.xml'
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-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index 7d403d2..6a7f544 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -20,7 +20,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-policy-handler-sonar
@@ -32,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-docker-8c-8gg
project: 'dcaegen2/platform/policy-handler'
project-name: 'dcaegen2-platform-policy-handler'
branch: 'master'
@@ -46,7 +46,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/policy-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-policy-handler'
branch: 'master'
mvn-settings: 'dcaegen2-platform-policy-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index db819a1..a456b4f 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'
@@ -30,7 +30,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-platform-servicechange-handler-clm
@@ -38,7 +38,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/platform/servicechange-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-servicechange-handler'
branch: 'master'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 4b43e2c..017eb64 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -18,7 +18,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-datalake-handler-release
@@ -34,7 +34,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'
@@ -47,7 +47,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-datalake-handler-admin-ui-release
@@ -63,7 +63,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'
@@ -76,7 +76,7 @@
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 +88,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..1c2dd59 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
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index e9c8531..7a23af1 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -21,7 +21,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-services-heartbeat-sonar
@@ -33,7 +33,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/heartbeat'
project-name: 'dcaegen2-services-heartbeat'
branch: 'master'
@@ -47,7 +47,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/heartbeat
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-heartbeat'
branch: 'master'
mvn-settings: 'dcaegen2-services-heartbeat-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 76c1337..6e0fe73 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'
@@ -24,7 +24,7 @@
mvn-settings: 'dcaegen2-services-mapper-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
maven-deploy-properties: |
deployAtEnd=true
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/services/mapper'
project-name: 'dcaegen2-services-mapper'
branch: 'master'
@@ -52,7 +52,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/mapper
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-mapper'
branch: 'master'
mvn-settings: 'dcaegen2-services-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index dca7dd5..f486b95 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -13,7 +13,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-verify-java':
mvn-goals: 'clean install docker:build'
@@ -26,7 +26,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean install docker:build docker:push'
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/pm-mapper'
project-name: 'dcaegen2-services-pm-mapper'
branch: 'master'
@@ -55,7 +55,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/pm-mapper
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-pm-mapper'
branch: 'master'
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index bb5aa84..c2672c1 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'
@@ -24,7 +24,7 @@
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
maven-deploy-properties: |
deployAtEnd=true
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
project: 'dcaegen2/services/prh'
project-name: 'dcaegen2-services-prh'
@@ -53,7 +53,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/prh
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
project-name: 'dcaegen2-services-prh'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 4d90397..377a276 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -30,7 +30,7 @@
jobs:
- '{project-name}-{stream}-integration-pairwise':
build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/sdk'
project-name: 'dcaegen2-services-sdk'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 27d546b..a969c81 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'
@@ -24,7 +24,7 @@
mvn-settings: 'dcaegen2-services-son-handler-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
maven-deploy-properties: |
deployAtEnd=true
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/services/son-handler'
project-name: 'dcaegen2-services-son-handler'
branch: 'master'
@@ -52,7 +52,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/services/son-handler
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-son-handler'
branch: 'master'
mvn-settings: 'dcaegen2-services-son-handler-settings'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 9388c2b..2603a69 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -21,7 +21,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-utils-sonar
@@ -33,7 +33,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'dcaegen2/utils'
project-name: 'dcaegen2-utils'
branch: 'master'
@@ -47,7 +47,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/utils
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-utils'
branch: 'master'
mvn-settings: 'dcaegen2-utils-settings'
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/global-macros.yaml b/jjb/global-macros.yaml
index c783015..9c70eec 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -403,7 +403,7 @@
exclude-no-code-change: 'false'
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^verify-helm$'
+ comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
projects:
- project-compare-type: 'ANT'
project-pattern: '{project}'
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 6305828..2615157 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -1,5 +1,5 @@
---
-- job-template:
+- job-template: &verify_golang_bolierplate
# Job template for Golang verify jobs
#
# The purpose of this job template is to run:
@@ -72,6 +72,12 @@
maven-version: '{maven-version}'
- job-template:
+ # Job template for Golang verify jobs with subproject support
+
+ <<: *verify_golang_bolierplate
+ name: '{project-name}-{stream}-{subproject}-verify-golang'
+
+- job-template:
# Job template for Golang merge jobs
#
# The purpose of this job template is to run:
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 9b10ad6..40a6a93 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -4,7 +4,7 @@
disabled: '{disabled}'
project-type: freestyle
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
node: '{build-node}'
recipients: ''
java-version: 'openjdk11'
@@ -128,7 +128,7 @@
disabled: false
project-type: freestyle
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
node: '{build-node}'
recipients: ''
java-version: 'openjdk11'
@@ -296,7 +296,7 @@
disabled: '{disabled}'
project-type: freestyle
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
node: '{build-node}'
recipients: ''
java-version: 'openjdk11'
@@ -426,7 +426,7 @@
disabled: false
project-type: freestyle
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
node: '{build-node}'
recipients: ''
java-version: 'openjdk11'
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 4f95f5e..ef112ea 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -49,20 +49,33 @@
golangver: 'golang112'
mvn-settings: 'integration-settings'
archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
jobs:
- - '{project-name}-{stream}-verify-golang':
- script: '{build_script}'
- path: 'test/security/k8s'
- pattern: '{path}/**'
+ - '{project-name}-{stream}-{subproject}-verify-golang'
+ subproject:
+ - 'test-security-k8s':
+ path: 'test/security/k8s'
+ pattern: '{path}/**'
+ build-node: ubuntu1804-builder-4c-4g
+ script: |
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ cd $WORKSPACE/{path}
+ make test
+ - 'test-security-sslendpoints':
+ path: 'test/security/sslendpoints'
+ pattern: '{path}/**'
+ build-node: ubuntu1804-docker-8c-8g
+ script: |
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ cd $WORKSPACE/{path}
+ rm -rf $WORKSPACE/{path}/bin
+ make docker-build
+ make test
+ make clean
stream:
- 'master':
branch: 'master'
- build_script: |
- #!/bin/bash
- set -ex # Fail build if any setup step fails
- cd test/security/k8s
- make test
- project:
name: integration-netconf-pnp-simulator
diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml
new file mode 100644
index 0000000..fbf56a4
--- /dev/null
+++ b/jjb/integration/usecases/integration-usecases-bbs.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+ name: integration-usecases-bbs-info
+ project-name: integration-usecases-bbs
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/usecases/bbs
+ branch: master
+
+- project:
+ name: integration-usecases-bbs-linters
+ project: integration/usecases/bbs
+ project-name: integration-usecases-bbs
+ python-version: python3
+ jobs:
+ - '{project-name}-{stream}-{subproject}-lint'
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml'
+ - 'yml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ stream:
+ - 'master':
+ branch: 'master'
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/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 583703c..73b2771 100644
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -1,6 +1,7 @@
- project:
name: optf-has-csit
jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: optf-has
recipients: 'snarayanan@research.att.com'
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index 9951184..7a9c7fc 100644
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -1,6 +1,7 @@
- project:
name: optf-osdf-csit
jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: optf-osdf
recipients: 'snarayanan@research.att.com'
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 1923c76..42cfd7c 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 maven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -35,7 +35,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-apex-pdp-sonar
@@ -47,7 +47,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-8c-8g
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 534e476..4c4c47d 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.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'
@@ -29,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-api-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/api'
project-name: 'policy-api'
branch: 'master'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 1499e00..006ad3b 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -20,7 +20,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-common-sonar
@@ -32,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/common'
project-name: 'policy-common'
branch: 'master'
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 661b351..9cb4ca0 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'
@@ -29,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-distribution-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/distribution'
project-name: 'policy-distribution'
branch: 'master'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 5688d1f..61ac6fe 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -8,9 +8,9 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: "-P docker"
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -25,7 +25,7 @@
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-docker-base-common
@@ -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,7 +70,7 @@
- compare-type: REG_EXP
pattern: 'do_not_match_any_file'
- '{project-name}-docker-manifest-{stream}':
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-multiarch-docker-stage-{stream}'
# - '{project-name}-gerrit-release-jobs':
# build-node: centos7-docker-8c-8g
@@ -82,7 +82,7 @@
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-docker-clm
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7935f33..d255266 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':
@@ -29,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-drools-applications-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/drools-applications'
project-name: 'policy-drools-applications'
branch: 'master'
@@ -60,7 +60,7 @@
branch: 'master'
mvn-settings: 'policy-drools-applications-settings'
java-version: openjdk11
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-drools-applications-info
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 25b45e0..6440e35 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':
@@ -29,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-drools-pdp-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/drools-pdp'
project-name: 'policy-drools-pdp'
branch: 'master'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 0ebc274..9f8030a 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':
@@ -29,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: policy-engine-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/engine'
project-name: 'policy-engine'
branch: 'master'
@@ -61,7 +61,7 @@
branch: 'master'
mvn-settings: 'policy-engine-settings'
java-version: openjdk11
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
- project:
name: policy-engine-info
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 8b85b6e..0b9e637 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -20,7 +20,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-models-sonar
@@ -32,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/models'
project-name: 'policy-models'
branch: 'master'
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 2bc95a3..75c9e22 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -5,52 +5,21 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java':
- project-name: 'policy-pap-amd64'
docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+ mvn-params: '-P docker'
build-node: ubuntu1804-docker-8c-8g
- pattern: 'do_not_match_any_file'
- - '{project-name}-{stream}-merge-java':
- project-name: 'policy-pap-arm64'
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- build-node: ubuntu1804-docker-arm64-4c-2g
- pattern: 'do_not_match_any_file'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- - '{project-name}-multiarch-{stream}-merge-java':
- build-node: ubuntu1804-docker-8c-8g
- - gerrit-maven-docker-stage:
- project-name: 'policy-pap-arm64'
- build-node: ubuntu1804-docker-arm64-4c-2g
- maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- container-public-registry: 'docker.io'
- container-staging-registry: 'docker.io'
- cron: ''
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: 'do_not_match_any_file'
- - gerrit-maven-docker-stage:
- project-name: 'policy-pap-amd64'
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- container-public-registry: 'docker.io'
- container-staging-registry: 'docker.io'
- cron: ''
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: 'do_not_match_any_file'
- - '{project-name}-docker-manifest-{stream}':
- build-node: centos7-docker-8c-8g
- - '{project-name}-multiarch-docker-stage-{stream}'
project: 'policy/pap'
stream:
@@ -60,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-pap-sonar
@@ -72,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/pap'
project-name: 'policy-pap'
branch: 'master'
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 013bc3e..7901d4f 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -20,7 +20,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-parent-clm
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 0915bf0..a4982aa 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.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'
@@ -29,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-xacml-pdp-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/xacml-pdp'
project-name: 'policy-xacml-pdp'
branch: 'master'
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 7edb47b..fa76df1 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -14,6 +14,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
project: 'portal'
stream:
- 'master':
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index e67e8e8..f17fd1a 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -82,12 +82,13 @@
- project:
name: sdc-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar:
+ build-timeout: 120
sonarcloud: true
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-8c-8g
project: 'sdc'
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..8cba7aa 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'
@@ -32,7 +32,7 @@
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 +62,7 @@
nexus-iq-namespace: 'onap-'
project: sdnc/oam
project-name: 'sdnc-oam'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
stream:
- 'master':
branch: 'master'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 323bca4..cb7d0c9 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -16,9 +16,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ mvn-params: '-P docker -DskipTests'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
mvn-settings: 'so-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: so-sonar
@@ -45,7 +45,7 @@
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
max-git-repo-age-hours: 48
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'so'
project-name: 'so'
branch: 'master'
@@ -58,12 +58,12 @@
jobs:
- 'onap-gerrit-maven-coverity'
cron: '@daily'
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
project: 'so'
project-name: 'so'
branch: 'master'
mvn-settings: 'so-settings'
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: '-DskipTests'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
coverity-project-name: 'onap-so'
coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ'
@@ -88,7 +88,7 @@
nexus-iq-namespace: 'onap-'
project: so
project-name: 'so'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
stream:
- 'master':
branch: 'master'
diff --git a/jjb/usecases/config-over-netconf.yaml b/jjb/usecases/usecases-csit.yaml
similarity index 82%
rename from jjb/usecases/config-over-netconf.yaml
rename to jjb/usecases/usecases-csit.yaml
index 27491d1..69e92f8 100644
--- a/jjb/usecases/config-over-netconf.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -13,4 +13,7 @@
- 'config-over-netconf':
trigger_jobs:
- '{project-name}-{stream}-docker-java-shell-daily'
+ - 'pnf-sw-upgrade':
+ trigger_jobs:
+ - '{project-name}-{stream}-docker-java-shell-daily'
robot-options: ''
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/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index d6a48cd..f5e7f43 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -9,6 +9,8 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'vnfsdk/validation'
stream:
- 'master':
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'