summaryrefslogtreecommitdiffstats
path: root/jjb/vfc
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vfc')
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml13
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml13
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml9
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml2
10 files changed, 43 insertions, 15 deletions
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 29ba9c1b6..da2c2341e 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -19,7 +19,7 @@
java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 28768aef6..3f5455c03 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -18,7 +18,7 @@
java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 4a218e36c..5460d2693 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -19,7 +19,7 @@
java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 6a2de98ce..0e23d1ff9 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -20,7 +20,7 @@
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 230dda76a..c7e827ef6 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -21,14 +21,15 @@
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
- project:
- name: vfc-nfvo-driver-svnfm-sonar
+ name: vfc-nfvo-driver-svnfm-huawei-sonar
jobs:
- gerrit-maven-sonar
build-node: ubuntu1604-basebuild-4c-4g
+ mvn-params: '-f huawei/pom.xml'
java-version: ''
- project: 'vfc/nfvo/driver/svnfm'
- project-name: 'vfc-nfvo-driver-svnfm'
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ project-name: 'vfc-nfvo-driver-svnfm-huawei'
branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-svnfm-settings'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index d5ffed53f..215c10aeb 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -19,7 +19,7 @@
java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
index b6bf8321a..544dcb691 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -19,3 +19,16 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-sonar
+ jobs:
+ - gerrit-maven-sonar
+ build-node: ubuntu1604-basebuild-4c-4g
+ java-version: ''
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index e0f66f946..f030e1ba4 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -22,3 +22,16 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
+ jobs:
+ - gerrit-maven-sonar
+ mvn-params: '-f nokia/vnfmdriver/pom.xml'
+ build-node: ubuntu1604-basebuild-4c-4g
+ java-version: ''
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia'
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
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 887eea52b..880e976fb 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -19,19 +19,20 @@
java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
- project:
- name: vfc-nfvo-driver-vnfm-svnfm-sonar
+ name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
jobs:
- gerrit-maven-sonar
+ mvn-params: '-f zte/vmanager/pom.xml'
build-node: ubuntu1604-basebuild-4c-4g
java-version: ''
project: 'vfc/nfvo/driver/vnfm/svnfm'
- project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+ project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index f6c7cc9ea..488f42db5 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -15,7 +15,7 @@
java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'