Merge "Add java verify and merge file to vfc-gvnfm-vnfmgr"
diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge-master.yaml
new file mode 100644
index 0000000..ee9f5e6
--- /dev/null
+++ b/jjb/testsuite/testsuite-heatbridge-master.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+ name: testsuite-heatbridge-master
+ project-name: 'testsuite-heatbridge'
+ subproject:
+ - heatbridge:
+ path: '.'
+ pattern: '**'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ project: 'testsuite/heatbridge'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'testsuite-heatbridge-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge-release.yaml
similarity index 82%
rename from jjb/testsuite/testsuite-heatbridge.yaml
rename to jjb/testsuite/testsuite-heatbridge-release.yaml
index 97aedd6..cf46f14 100644
--- a/jjb/testsuite/testsuite-heatbridge.yaml
+++ b/jjb/testsuite/testsuite-heatbridge-release.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: testsuite-heatbridge
+ name: testsuite-heatbridge-release
project-name: 'testsuite-heatbridge'
subproject:
- heatbridge:
@@ -12,8 +12,6 @@
project: 'testsuite/heatbridge'
stream:
- - 'master':
- branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
mvn-settings: 'testsuite-heatbridge-settings'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
new file mode 100644
index 0000000..eae0259
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -0,0 +1,20 @@
+---
+
+- project:
+ name: vfc-nfvo-lcm-java
+ project-name: 'vfc-nfvo-lcm'
+ project: 'vfc/nfvo/lcm'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-lcm-settings'
+ subproject:
+ - 'lcm':
+ pom: 'lcm/pom.xml'
+ pattern: 'lcm/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file