summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ecompsdkos/ecompsdkos.yaml2
-rw-r--r--jjb/global-templates-java.yaml10
-rw-r--r--jjb/msb/msb-apigateway.yaml21
-rw-r--r--jjb/msb/msb-discovery.yaml21
-rw-r--r--jjb/so/so-libs.yaml (renamed from jjb/mso/mso-libs.yaml)8
-rw-r--r--jjb/so/so.yaml (renamed from jjb/mso/mso.yaml)8
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-python.yaml17
7 files changed, 74 insertions, 13 deletions
diff --git a/jjb/ecompsdkos/ecompsdkos.yaml b/jjb/ecompsdkos/ecompsdkos.yaml
index 035d3839e..ab562f4a3 100644
--- a/jjb/ecompsdkos/ecompsdkos.yaml
+++ b/jjb/ecompsdkos/ecompsdkos.yaml
@@ -21,6 +21,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'release-1.1.0':
+ branch: 'release-1.1.0'
mvn-settings: 'ecompsdkos-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c3e137951..6ca41efae 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -424,7 +424,7 @@
properties-file: version.properties
- maven-target:
maven-version: '{maven-version}'
- goals: 'versions:set versions:update-child-modules versions:commit'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
properties:
- 'newVersion=${{release_version}}'
settings: '{mvn-settings}'
@@ -499,7 +499,7 @@
properties-file: version.properties
- maven-target:
maven-version: '{maven-version}'
- goals: 'versions:set versions:update-child-modules versions:commit'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
properties:
- 'newVersion=${{release_version}}'
settings: '{mvn-settings}'
@@ -1052,7 +1052,7 @@
- maven-target:
maven-version: '{maven-version}'
- goals: 'versions:set versions:update-child-modules versions:commit'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
properties:
- 'newVersion=${{release_version}}'
settings: '{mvn-settings}'
@@ -1122,7 +1122,7 @@
- maven-target:
maven-version: '{maven-version}'
- goals: 'versions:set versions:update-child-modules versions:commit'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
properties:
- 'newVersion=${{release_version}}'
settings: '{mvn-settings}'
@@ -1425,7 +1425,7 @@
properties-file: version.properties
- maven-target:
maven-version: '{maven-version}'
- goals: 'versions:set versions:update-child-modules versions:commit'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
properties:
- 'newVersion=${{release_version}}'
settings: '{mvn-settings}'
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
new file mode 100644
index 000000000..3fc8bb6bc
--- /dev/null
+++ b/jjb/msb/msb-apigateway.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+ name: msb-apigateway
+ project-name: 'msb-apigateway'
+ 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: 'msb/apigateway'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'msb-apigateway-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
new file mode 100644
index 000000000..f35572caa
--- /dev/null
+++ b/jjb/msb/msb-discovery.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+ name: msb-discovery
+ project-name: 'msb-discovery'
+ 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: 'msb/discovery'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'msb-discovery-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/mso/mso-libs.yaml b/jjb/so/so-libs.yaml
index 6069f7abb..673045cd7 100644
--- a/jjb/mso/mso-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -1,7 +1,7 @@
---
- project:
- name: mso-libs
- project-name: 'mso-libs'
+ name: so-libs
+ project-name: 'so-libs'
jobs:
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
@@ -11,13 +11,13 @@
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
- project: 'mso/libs'
+ project: 'so/libs'
stream:
- 'master':
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
- mvn-settings: 'mso-settings'
+ mvn-settings: 'so-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/mso/mso.yaml b/jjb/so/so.yaml
index 971f32baf..a7b2e2b0b 100644
--- a/jjb/mso/mso.yaml
+++ b/jjb/so/so.yaml
@@ -1,8 +1,8 @@
---
- project:
- name: mso
- project-name: 'mso'
+ name: so
+ project-name: 'so'
jobs:
- '{project-name}-{stream}-verify-profile-java':
mvn-profile: 'with-integration-tests'
@@ -22,13 +22,13 @@
trigger-job: '{project-name}-{stream}-release-version-java-daily'
build-node: 'ubuntu1604-basebuild-8c-8g'
- project: 'mso'
+ project: 'so'
stream:
- 'master':
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
- mvn-settings: 'mso-settings'
+ mvn-settings: 'so-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
new file mode 100644
index 000000000..db7762f3e
--- /dev/null
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -0,0 +1,17 @@
+---
+
+- project:
+ name: vfc-gvnfm-vnfres
+ project-name: 'vfc-gvnfm-vnfres'
+ project: 'vfc/gvnfm/vnfres'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-gvnfm-vnfres-settings'
+ build-node: ubuntu1604-basebuild-4c-4g
+ subproject:
+ - 'res':
+ path: 'res'
+ pattern: 'res/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-python'