Merge "Pass mvn properties to clamp merge job"
diff --git a/jjb/appc/appc.yaml b/jjb/appc/appc-master.yaml
similarity index 88%
rename from jjb/appc/appc.yaml
rename to jjb/appc/appc-master.yaml
index a0e7ac0..0771a12 100644
--- a/jjb/appc/appc.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -1,7 +1,6 @@
---
-
- project:
- name: appc
+ name: appc-master
project-name: 'appc'
jobs:
- '{project-name}-{stream}-clm'
@@ -16,8 +15,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
mvn-settings: 'appc-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/appc/appc.yaml b/jjb/appc/appc-release.yaml
similarity index 81%
copy from jjb/appc/appc.yaml
copy to jjb/appc/appc-release.yaml
index a0e7ac0..075f552 100644
--- a/jjb/appc/appc.yaml
+++ b/jjb/appc/appc-release.yaml
@@ -1,21 +1,18 @@
---
-
- project:
- name: appc
+ name: appc-release
project-name: 'appc'
jobs:
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
project: 'appc'
stream:
- - 'master':
- branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
mvn-settings: 'appc-settings'
diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml
new file mode 100644
index 0000000..5c91767
--- /dev/null
+++ b/jjb/ccsdk/storage-esaas.yaml
@@ -0,0 +1,27 @@
+---
+- project:
+ name: ccsdk-storage-esaas
+ project-name: 'ccsdk-storage-esaas'
+ jobs:
+ - '{project-name}-{stream}-clm'
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+ project: 'ccsdk/storage/esaas'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'release-1.0.0':
+ branch: 'release-1.0.0'
+ mvn-settings: 'ccsdk-storage-esaas-settings'
+ # due to a strange macro / variable translation problem this needs to be
+ # passed as a string block to properly get the properties correctly defined
+ # in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
new file mode 100644
index 0000000..e24f67f
--- /dev/null
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@ -0,0 +1,27 @@
+---
+- project:
+ name: ccsdk-storage-pgaas
+ project-name: 'ccsdk-storage-pgaas'
+ jobs:
+ - '{project-name}-{stream}-clm'
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+ project: 'ccsdk/storage/pgaas'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'release-1.0.0':
+ branch: 'release-1.0.0'
+ mvn-settings: 'ccsdk-storage-pgaas-settings'
+ # due to a strange macro / variable translation problem this needs to be
+ # passed as a string block to properly get the properties correctly defined
+ # in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/appc/appc.yaml b/jjb/holmes/holmes-common.yaml
similarity index 76%
copy from jjb/appc/appc.yaml
copy to jjb/holmes/holmes-common.yaml
index a0e7ac0..797fb76 100644
--- a/jjb/appc/appc.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -1,8 +1,7 @@
---
-
- project:
- name: appc
- project-name: 'appc'
+ name: holmes-common
+ project-name: 'holmes-common'
jobs:
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
@@ -12,13 +11,11 @@
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
- project: 'appc'
+ project: 'holmes/common'
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- mvn-settings: 'appc-settings'
+ mvn-settings: 'holmes-common-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/appc/appc.yaml b/jjb/holmes/holmes-dsa.yaml
similarity index 76%
copy from jjb/appc/appc.yaml
copy to jjb/holmes/holmes-dsa.yaml
index a0e7ac0..46400d8 100644
--- a/jjb/appc/appc.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -1,8 +1,7 @@
---
-
- project:
- name: appc
- project-name: 'appc'
+ name: holmes-dsa
+ project-name: 'holmes-dsa'
jobs:
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
@@ -12,13 +11,11 @@
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
- project: 'appc'
+ project: 'holmes/dsa'
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- mvn-settings: 'appc-settings'
+ mvn-settings: 'holmes-dsa-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/appc/appc.yaml b/jjb/holmes/holmes-engine-mgt.yaml
similarity index 74%
copy from jjb/appc/appc.yaml
copy to jjb/holmes/holmes-engine-mgt.yaml
index a0e7ac0..74d2ce5 100644
--- a/jjb/appc/appc.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -1,8 +1,7 @@
---
-
- project:
- name: appc
- project-name: 'appc'
+ name: holmes-engine-management
+ project-name: 'holmes-engine-management'
jobs:
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
@@ -12,13 +11,11 @@
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
- project: 'appc'
+ project: 'holmes/engine-management'
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- mvn-settings: 'appc-settings'
+ mvn-settings: 'holmes-engine-management-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/appc/appc.yaml b/jjb/holmes/holmes-rule-mgt.yaml
similarity index 75%
copy from jjb/appc/appc.yaml
copy to jjb/holmes/holmes-rule-mgt.yaml
index a0e7ac0..d719402 100644
--- a/jjb/appc/appc.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -1,8 +1,7 @@
---
-
- project:
- name: appc
- project-name: 'appc'
+ name: holmes-rule-management
+ project-name: 'holmes-rule-management'
jobs:
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
@@ -12,13 +11,11 @@
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
- project: 'appc'
+ project: 'holmes/rule-management'
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- mvn-settings: 'appc-settings'
+ mvn-settings: 'holmes-rule-management-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 673045c..5f36982 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -17,7 +17,7 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
- mvn-settings: 'so-settings'
+ mvn-settings: 'so-libs-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
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-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-driver-svnfm-huawei.yaml
new file mode 100644
index 0000000..bf2ec6e
--- /dev/null
+++ b/jjb/vfc/vfc-driver-svnfm-huawei.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+ name: vfc-nfvo-driver-svnfm-Huawei
+ project-name: 'vfc-nfvo-driver-svnfm'
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-svnfm-settings'
+ subproject:
+ - 'drv-vnfm-huawei':
+ pom: 'huawei/vnfmadapter/pom.xml'
+ pattern: 'huawei/vnfmadapter/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
new file mode 100644
index 0000000..5fec8cc
--- /dev/null
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+ name: vfc-gvnfm-vnfmgr-java
+ project-name: 'vfc-gvnfm-vnfmgr'
+ project: 'vfc/gvnfm/vnfmgr'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+ subproject:
+ - 'mgr':
+ pom: 'mgr/pom.xml'
+ pattern: 'mgr/**'
+ 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
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index cfcd4da..da8460d 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -2,12 +2,12 @@
- project:
name: vfc-gvnfm-vnfres-java
- project-name: 'vfc-gvnfm-vfcres-java'
+ project-name: 'vfc-gvnfm-vnfres'
project: 'vfc/gvnfm/vnfres'
stream:
- 'master':
branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfres-java-settings'
+ mvn-settings: 'vfc-gvnfm-vnfres-settings'
subproject:
- 'res':
pom: 'res/pom.xml'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index db7762f..947923a 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.0.0':
+ branch: 'release-1.0.0'
mvn-settings: 'vfc-gvnfm-vnfres-settings'
build-node: ubuntu1604-basebuild-4c-4g
subproject:
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
new file mode 100644
index 0000000..e8a5e84
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+ name: vfc-nfvo-driver-sfc
+ project-name: 'vfc-nfvo-driver-sfc'
+ project: 'vfc/nfvo/driver/sfc'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-sfc-settings'
+ subproject:
+ - 'driver-sfc-zte':
+ pom: 'zte/sfc-driver/pom.xml'
+ pattern: 'zte/sfc-driver/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
new file mode 100644
index 0000000..b148c01
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -0,0 +1,16 @@
+---
+
+- 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'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index 9293693..aa71564 100644
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -11,7 +11,7 @@
build-node: ubuntu1604-basebuild-4c-4g
subproject:
- 'lcm':
- path: 'lcm'
- pattern: 'lcm/**'
+ path: '.'
+ pattern: '**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/vnfsdk/vnfsdk-lctest-csit.yaml b/jjb/vnfsdk/vnfsdk-lctest-csit.yaml
new file mode 100644
index 0000000..954cb35
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-lctest-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: vnfsdk-lctest-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'vnfsdk-lctest'
+ stream: 'master'
+ functionality:
+ - 'sanity-check':
+ trigger_jobs:
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml
new file mode 100644
index 0000000..9a7e2a1
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-lctest.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: vnfsdk-lctest
+ project: 'vnfsdk/lctest'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project-name: 'vnfsdk-lctest'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vnfsdk-lctest-settings'