Run CCSDK and SDNC merge jobs daily
Updated CCSDK and SDNC JJBs:
1) To use global jjb verify and merge jobs (vs older global-template)
2) To run merge jobs (SNAPSHOT builds) daily
3) To run staging jobs only on demand.
Change-Id: Ia5bee0d5ee765ba501af855e06d5637fdbf61568
Issue-ID: CIMAN-357
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index e1ddf76..ab202ed 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -9,12 +9,14 @@
name: ccsdk-apps
project-name: 'ccsdk-apps'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
mvn-params: '-P dependency-list'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
+ cron: ''
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
@@ -40,6 +42,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-apps-sonar
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index cc4c33d..d2bde42 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -3,13 +3,15 @@
name: ccsdk-cds
project-name: 'ccsdk-cds'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
mvn-params: '-P dependency-list'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
maven-versions-plugin: true
+ cron: ''
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
@@ -17,6 +19,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
+ cron: ''
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -36,6 +39,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-cds-sonar
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 298afa2..727b6ee 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -3,10 +3,12 @@
name: ccsdk-dashboard
project-name: 'ccsdk-dashboard'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
+ cron: ''
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -25,6 +27,8 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-docker-8c-8g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-dashboard-sonar
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index eb72293..b61a9ea 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -3,13 +3,15 @@
name: ccsdk-distribution
project-name: 'ccsdk-distribution'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
mvn-params: '-P dependency-list'
+ cron: '@daily'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
maven-versions-plugin: true
+ cron: ''
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
@@ -17,6 +19,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
+ cron: ''
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'ccsdk/distribution'
@@ -34,6 +37,8 @@
docker-pom: 'pom.xml'
mvn-profile: docker
build-node: ubuntu1604-docker-8c-8g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
#- project:
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 7a0375d..0ce073e 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -3,12 +3,14 @@
name: ccsdk-features
project-name: 'ccsdk-features'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
mvn-params: '-P dependency-list'
+ 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
@@ -29,8 +31,10 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+ mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-features-sonar
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index e344e88..3dcb729 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -3,11 +3,13 @@
name: ccsdk-platform-plugins
project-name: 'ccsdk-platform-plugins'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - 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
@@ -26,6 +28,8 @@
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-platform-plugins-sonar
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index c274881..daf2b42 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -3,12 +3,14 @@
name: ccsdk-sli-adaptors
project-name: 'ccsdk-sli-adaptors'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
mvn-params: '-P dependency-list'
+ 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
@@ -30,6 +32,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-sli-adaptors-sonar
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index b84d3ae..12bc102 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -3,12 +3,14 @@
name: ccsdk-sli-core
project-name: 'ccsdk-sli-core'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
mvn-params: '-P dependency-list'
+ 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
@@ -30,6 +32,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-sli-core-sonar
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index ebcc368..7f7c779 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -3,11 +3,13 @@
name: ccsdk-sli-northbound
project-name: 'ccsdk-sli-northbound'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
mvn-params: '-P dependency-list'
+ cron: '@daily'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
+ cron: ''
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -30,6 +32,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-sli-northbound-sonar
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 4eec8b2..245c64e 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -3,12 +3,14 @@
name: ccsdk-sli-plugins
project-name: 'ccsdk-sli-plugins'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
mvn-params: '-P dependency-list'
+ 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
@@ -30,6 +32,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-sli-plugins-sonar
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 03350a8..7b49b60 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -3,11 +3,13 @@
name: ccsdk-utils
project-name: 'ccsdk-utils'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - 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
@@ -23,6 +25,8 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: ccsdk-utils-clm
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 2de80e0..882796a 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -9,17 +9,20 @@
name: sdnc-apps
project-name: 'sdnc-apps'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
+ cron: ''
- 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"
+ cron: ''
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -42,6 +45,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: sdnc-apps-sonar
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 507d044..20665a3 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -3,11 +3,13 @@
name: sdnc-northbound
project-name: 'sdnc-northbound'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
+ cron: ''
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
@@ -30,6 +32,8 @@
archive-artifacts: ''
maven-version: "mvn35"
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: sdnc-northbound-sonar
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index d748105..563f474 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -4,12 +4,14 @@
name: sdnc-oam
project-name: 'sdnc-oam'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ cron: ''
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
@@ -17,6 +19,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
+ cron: ''
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
project: 'sdnc/oam'
@@ -32,6 +35,8 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
#
#- project: