summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/appc/appc-deployment.yaml16
-rw-r--r--jjb/appc/appc.yaml (renamed from jjb/aai/aai-aai-data.yaml)9
-rw-r--r--jjb/demo/demo.yaml (renamed from jjb/aai/aai-aai-config.yaml)9
-rw-r--r--jjb/ecompsdkos/ecompsdkos.yaml10
-rw-r--r--jjb/global-templates-python.yaml3
-rw-r--r--jjb/portal/portal.yaml8
-rw-r--r--jjb/sdc/sdc-sdc_common.yaml16
-rw-r--r--jjb/sdc/sdc.yaml16
-rw-r--r--jjb/sdc/sdc_distribution_client.yaml16
-rw-r--r--jjb/ui/ui-dmaapbc.yaml15
10 files changed, 103 insertions, 15 deletions
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
new file mode 100644
index 000000000..fdc48b63a
--- /dev/null
+++ b/jjb/appc/appc-deployment.yaml
@@ -0,0 +1,16 @@
+---
+
+- project:
+ name: appc-deployment
+ project-name: 'appc-deployment'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'appc/deployment'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'appc-deployment-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/appc/appc.yaml
index 5e5632d41..b03a9b741 100644
--- a/jjb/aai/aai-aai-data.yaml
+++ b/jjb/appc/appc.yaml
@@ -1,15 +1,16 @@
---
+
- project:
- name: aai-aai-data
- project-name: 'aai-aai-data'
+ name: appc
+ project-name: 'appc'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- project: 'aai/aai-data'
+ project: 'appc'
stream:
- 'master':
branch: 'master'
- mvn-settings: 'aai-aai-data-settings'
+ mvn-settings: 'appc-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/demo/demo.yaml
index c477ad896..47fa0a8ce 100644
--- a/jjb/aai/aai-aai-config.yaml
+++ b/jjb/demo/demo.yaml
@@ -1,15 +1,16 @@
---
+
- project:
- name: aai-aai-config
- project-name: 'aai-aai-config'
+ name: demo
+ project-name: 'demo'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- project: 'aai/aai-config'
+ project: 'demo'
stream:
- 'master':
branch: 'master'
- mvn-settings: 'aai-aai-config-settings'
+ mvn-settings: 'demo-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/ecompsdkos/ecompsdkos.yaml b/jjb/ecompsdkos/ecompsdkos.yaml
index 5e97cc1d1..62501278a 100644
--- a/jjb/ecompsdkos/ecompsdkos.yaml
+++ b/jjb/ecompsdkos/ecompsdkos.yaml
@@ -2,10 +2,14 @@
- project:
name: ecompsdkos
project-name: 'ecompsdkos'
+ subproject:
+ - 'ecomp-sdk':
+ pom: 'ecomp-sdk/pom.xml'
+ pattern: 'ecomp-sdk/**'
+
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
project: 'ecompsdkos'
stream:
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index f0663bc1f..7404b7e74 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -48,6 +48,9 @@
files: '{pattern}'
builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
- shell: |
virtualenv $WORKSPACE/venv-tox
source $WORKSPACE/venv-tox/bin/activate
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 16d5e229a..2bb6dc773 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -2,9 +2,13 @@
- project:
name: portal
project-name: 'portal'
+ subproject:
+ - 'ecomp-portal-BE':
+ pom: 'ecomp-portal-BE/pom.xml'
+ pattern: 'ecomp-portal-BE/**'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
project: 'portal'
stream:
diff --git a/jjb/sdc/sdc-sdc_common.yaml b/jjb/sdc/sdc-sdc_common.yaml
new file mode 100644
index 000000000..a29eb316e
--- /dev/null
+++ b/jjb/sdc/sdc-sdc_common.yaml
@@ -0,0 +1,16 @@
+---
+
+- project:
+ name: sdc-sdc_common
+ project-name: 'sdc-sdc_common'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'sdc/sdc_common'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdc-sdc_common-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
new file mode 100644
index 000000000..ade674a6f
--- /dev/null
+++ b/jjb/sdc/sdc.yaml
@@ -0,0 +1,16 @@
+---
+
+- project:
+ name: sdc
+ project-name: 'sdc'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'sdc'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdc-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/sdc/sdc_distribution_client.yaml b/jjb/sdc/sdc_distribution_client.yaml
new file mode 100644
index 000000000..3425ddd0c
--- /dev/null
+++ b/jjb/sdc/sdc_distribution_client.yaml
@@ -0,0 +1,16 @@
+---
+
+- project:
+ name: sdc_distribution_client
+ project-name: 'sdc_distribution_client'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'sdc_distribution_client'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdc_distribution_client-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index 2624083bd..0863cc118 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -2,9 +2,20 @@
- project:
name: ui-dmaapbc
project-name: 'ui-dmaapbc'
+ subproject:
+ - 'dcae_dmaapbc_client':
+ pom: 'dcae_dmaapbc_client/pom.xml'
+ pattern: 'dcae_dmaapbc_client/**'
+ - 'dcae_dmaapbc_model':
+ pom: 'dcae_dmaapbc_model/pom.xml'
+ pattern: 'dcae_dmaapbc_model/**'
+ - 'dcae_dmaapbc_webapp':
+ pom: 'dcae_dmaapbc_webapp/pom.xml'
+ pattern: 'dcae_dmaapbc_webapp/**'
+
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
project: 'ui/dmaapbc'
stream: