summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/appc/appc-csit.yaml7
-rw-r--r--jjb/clamp/clamp.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-csit.yaml7
-rw-r--r--jjb/dcaegen2/dcaegen2.yaml2
-rw-r--r--jjb/portal/portal.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml4
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml4
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml2
-rw-r--r--jjb/vvp/vvp-jenkins.yaml2
18 files changed, 48 insertions, 10 deletions
diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index 1a364df32..e257a8bc4 100644
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -5,10 +5,13 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'appc'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
functionality:
- 'healthcheck':
trigger_jobs:
- '{project-name}-{stream}-release-java-daily-checkstyle'
robot-options: ''
- branch: 'master'
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 4274513bd..20776992a 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -4,6 +4,8 @@
name: clamp
project-name: 'clamp'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java-checkstyle'
- '{project-name}-{stream}-merge-properties-java':
mvn_properties:
diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
index f4e5d001c..cf22f35d6 100644
--- a/jjb/dcaegen2/dcaegen2-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-csit.yaml
@@ -4,11 +4,14 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'dcaegen2'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
functionality:
- 'testsuites':
trigger_jobs:
- 'dcaegen2-master-merge-java'
- 'dcaegen2-collectors-ves-master-merge-java'
robot-options: ''
- branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index b07b848c0..6fb6fccc1 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -3,6 +3,8 @@
name: dcaegen2
project-name: 'dcaegen2'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index e16aa1aa3..6d125fcfe 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -3,6 +3,8 @@
name: portal
project-name: 'portal'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-release-java-daily'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 1ef32095f..0d39d877c 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -15,6 +15,8 @@
pom: 'lcm/pom.xml'
pattern: 'lcm/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -25,4 +27,4 @@
!include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index fce48b4f1..d3dbdd0e5 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -14,6 +14,8 @@
pom: 'mgr/pom.xml'
pattern: 'mgr/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -24,4 +26,4 @@
!include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 77ec4d95e..bc84f2c9f 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -15,6 +15,8 @@
pom: 'res/pom.xml'
pattern: 'res/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -25,4 +27,4 @@
!include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 4d3b71b91..8de899203 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -15,6 +15,8 @@
path: '.'
pattern: '**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 039f3fd87..fb0f5046f 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -15,6 +15,8 @@
pom: 'ems/pom.xml'
pattern: 'ems/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -25,4 +27,4 @@
!include-raw-escape: 'build-driver-ems-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 367de28c3..a7fa3a849 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -14,6 +14,8 @@
pom: 'zte/sfc-driver/pom.xml'
pattern: 'zte/sfc-driver/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 4e8e47e3a..d91e4d854 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -15,6 +15,8 @@
pom: 'gvnfmadapter/pom.xml'
pattern: 'gvnfmadapter/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
@@ -25,4 +27,4 @@
!include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index 4d33e756a..e0f66f946 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -14,6 +14,8 @@
pom: 'nokia/vnfmdriver/pom.xml'
pattern: 'nokia/vnfmdriver/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
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 017427013..2e3642fd9 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -15,9 +15,11 @@
pom: 'zte/vmanager/pom.xml'
pattern: 'zte/vmanager/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 330730213..85812b0cc 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -11,6 +11,8 @@
branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-lcm-settings'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 5c88c895a..b690f50da 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -12,6 +12,8 @@
branch: 'amsterdam'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 767b3e737..fb48ce0c3 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -22,6 +22,8 @@
script:
!include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index fefc29ce2..db77aa094 100644
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -14,6 +14,8 @@
mvn-settings: 'vvp-jenkins-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'