summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/ccsdk/storage-esaas.yaml27
-rw-r--r--jjb/ccsdk/storage-pgaas.yaml27
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-python.yaml4
5 files changed, 60 insertions, 10 deletions
diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml
new file mode 100644
index 000000000..5c91767aa
--- /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 000000000..e24f67fd2
--- /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/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 969373d63..da8460d62 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-vnfres-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-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index eae0259b0..b148c01a2 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -8,13 +8,9 @@
- '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'
+ - '{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 92936932b..aa7156439 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'