summaryrefslogtreecommitdiffstats
path: root/jjb/vfc
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vfc')
-rwxr-xr-xjjb/vfc/build-nfvo-svnfm-driver-docker-image.sh5
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml3
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml3
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml9
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml35
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml3
16 files changed, 57 insertions, 30 deletions
diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index 2f33312c0..36a76a916 100755
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -11,6 +11,9 @@ chmod 755 ./zte/vmanager/docker/*.*
chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
-cd nokia/deployment
+chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
+./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
+
+cd nokiav2/deployment
mvn package -Dexec.args="buildDocker pushImage"
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index da2c2341e..9c265bccb 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -16,7 +16,6 @@
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'
@@ -32,8 +31,8 @@
name: vfc-gvnfm-vnflcm-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/gvnfm/vnflcm'
project-name: 'vfc-gvnfm-vnflcm'
branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 3f5455c03..fda343d94 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -15,7 +15,6 @@
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'
@@ -31,8 +30,8 @@
name: vfc-gvnfm-vnfmgr-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/gvnfm/vnfmgr'
project-name: 'vfc-gvnfm-vnfmgr'
branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 5460d2693..4f3db624d 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -16,7 +16,6 @@
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'
@@ -32,8 +31,8 @@
name: vfc-gvnfm-vnfres-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/gvnfm/vnfres'
project-name: 'vfc-gvnfm-vnfres'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 0e23d1ff9..f1b94d06f 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -16,7 +16,6 @@
pattern: '**'
jobs:
- gerrit-maven-clm:
- java-version: ''
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -33,8 +32,8 @@
name: vfc-nfvo-catalog-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/catalog'
project-name: 'vfc-nfvo-catalog'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 5d32025bd..c32ed915a 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -16,7 +16,6 @@
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'
@@ -32,8 +31,8 @@
name: vfc-nfvo-driver-ems-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/driver/ems'
project-name: 'vfc-nfvo-driver-ems'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 79edfb1ec..81a4877e6 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -15,7 +15,6 @@
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'
@@ -31,8 +30,9 @@
name: vfc-nfvo-driver-sfc-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ mvn-params: '-f zte/sfc-driver/pom.xml'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/driver/sfc'
project-name: 'vfc-nfvo-driver-sfc'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index c7e827ef6..ac614ad3e 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -24,9 +24,9 @@
name: vfc-nfvo-driver-svnfm-huawei-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
mvn-params: '-f huawei/pom.xml'
- java-version: ''
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-svnfm-huawei'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 215c10aeb..0096a64c0 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -16,7 +16,6 @@
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'
@@ -32,8 +31,8 @@
name: vfc-nfvo-driver-vnfm-gvnfm-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/driver/vnfm/gvnfm'
project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
branch: 'master'
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 544dcb691..55e874168 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -23,8 +23,8 @@
name: vfc-nfvo-driver-vnfm-svnfm-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index ae29db7ab..4aa36b109 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -11,11 +11,10 @@
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
subproject:
- 'drv-vnfm-nokia':
- pom: 'nokia/pom.xml'
- pattern: 'nokia/**'
+ pom: 'nokia/vnfmdirver/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'
@@ -26,9 +25,9 @@
name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
jobs:
- gerrit-maven-sonar
- mvn-params: '-f nokia/pom.xml'
+ cron: 'H 11 * * *'
+ 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'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
new file mode 100644
index 000000000..02ad8593b
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -0,0 +1,35 @@
+---
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-nokiav2
+ project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ subproject:
+ - 'drv-vnfm-nokiav2':
+ pom: 'nokiav2/pom.xml'
+ pattern: 'nokiav2/**'
+ 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'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
+ jobs:
+ - gerrit-maven-sonar
+ mvn-params: '-f nokiav2/pom.xml'
+ build-node: ubuntu1604-basebuild-4c-4g
+ java-version: ''
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2'
+ 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 880e976fb..19441f4cf 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -16,7 +16,6 @@
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'
@@ -27,9 +26,9 @@
name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
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-zte'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 488f42db5..8d23cac35 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -12,7 +12,6 @@
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'
@@ -28,8 +27,8 @@
name: vfc-nfvo-lcm-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/lcm'
project-name: 'vfc-nfvo-lcm'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index fab44e60f..7a5f91f2c 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -13,7 +13,6 @@
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'
@@ -26,8 +25,8 @@
name: vfc-nfvo-resmanagement-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/resmanagement'
project-name: 'vfc-nfvo-resmanagement'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index d32e03c61..397056a8f 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -23,7 +23,6 @@
!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'
@@ -36,8 +35,8 @@
name: vfc-nfvo-wfengine-sonar
jobs:
- gerrit-maven-sonar
+ cron: 'H 11 * * *'
build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
project: 'vfc/nfvo/wfengine'
project-name: 'vfc-nfvo-wfengine'
branch: 'master'