summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/sdc/sdc-dcae-d-ci.yaml10
-rw-r--r--jjb/sdc/sdc-dcae-d-dt-be-main.yaml10
-rw-r--r--jjb/sdc/sdc-dcae-d-dt-be-property.yaml10
-rw-r--r--jjb/sdc/sdc-dcae-d-dt.yaml11
-rw-r--r--jjb/sdc/sdc-dcae-d-fe.yaml11
-rw-r--r--jjb/sdc/sdc-jtosca.yaml10
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml10
-rw-r--r--jjb/sdc/sdc-sdc-titan-cassandra.yaml10
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml10
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml11
-rw-r--r--jjb/sdc/sdc.yaml16
11 files changed, 106 insertions, 13 deletions
diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index a43ad6392..595f86392 100644
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -3,7 +3,6 @@
name: sdc-dcae-d-ci
project-name: 'sdc-dcae-d-ci'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -33,3 +32,12 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-dcae-d-ci-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/dcae-d/ci
+ project-name: 'sdc-dcae-d-ci'
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-ci-settings'
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index 9980935ad..5d0f4b683 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -3,7 +3,6 @@
name: sdc-dcae-d-dt-be-main
project-name: 'sdc-dcae-d-dt-be-main'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -33,3 +32,12 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-dcae-d-dt-be-main-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/dcae-d/dt-be-main
+ project-name: 'sdc-dcae-d-dt-be-main'
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
index a60e6dd18..0e642dfff 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -3,7 +3,6 @@
name: sdc-dcae-d-dt-be-property
project-name: 'sdc-dcae-d-dt-be-property'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -29,3 +28,12 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-dcae-d-dt-be-property-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/dcae-d/dt-be-property
+ project-name: 'sdc-dcae-d-dt-be-property'
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 58d733157..5e5183d5d 100644
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -4,7 +4,6 @@
project-name: 'sdc-dcae-d-dt'
build-node: ubuntu1604-builder-4c-2g
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -34,3 +33,13 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-dcae-d-dt-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/dcae-d/dt
+ project-name: 'sdc-dcae-d-dt'
+ build-node: ubuntu1604-builder-4c-2g
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-dt-settings'
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index d92bd530c..c869906b4 100644
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -4,7 +4,6 @@
project-name: 'sdc-dcae-d-fe'
build-node: ubuntu1604-builder-4c-2g
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -34,3 +33,13 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-dcae-d-fe-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/dcae-d/fe
+ project-name: 'sdc-dcae-d-fe'
+ build-node: ubuntu1604-builder-4c-2g
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-fe-settings'
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 5e37e142f..2ff77ed8c 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -4,7 +4,6 @@
name: sdc-jtosca
project-name: 'sdc-jtosca'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -31,3 +30,12 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-jtosca-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/jtosca
+ project-name: 'sdc-jtosca'
+ branch: 'master'
+ mvn-settings: 'sdc-jtosca-settings'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 27bf97f44..4bf13dc52 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -4,7 +4,6 @@
name: sdc-sdc-distribution-client
project-name: 'sdc-sdc-distribution-client'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -31,3 +30,12 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-sdc-distribution-client-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/sdc-distribution-client
+ project-name: 'sdc-sdc-distribution-client'
+ branch: 'master'
+ mvn-settings: 'sdc-sdc-distribution-client-settings'
diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
index 128f02cb0..5b7d93730 100644
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -4,7 +4,6 @@
name: sdc-sdc-titan-cassandra
project-name: 'sdc-sdc-titan-cassandra'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -17,3 +16,12 @@
archive-artifacts: ''
build-timeout: 60
maven-version: 'mvn35'
+
+- project:
+ name: sdc-sdc-titan-cassandra-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/sdc-titan-cassandra
+ project-name: 'sdc-sdc-titan-cassandra'
+ branch: 'master'
+ mvn-settings: 'sdc-sdc-titan-cassandra-settings'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 5f3c2df7e..4f0c301bc 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -4,7 +4,6 @@
name: sdc-sdc-tosca
project-name: 'sdc-sdc-tosca'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
@@ -31,3 +30,12 @@
mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-sdc-tosca-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/sdc-tosca
+ project-name: 'sdc-sdc-tosca'
+ branch: 'master'
+ mvn-settings: 'sdc-sdc-tosca-settings'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 3d3af1dd1..e4524e7a0 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -3,7 +3,6 @@
name: sdc-sdc-workflow-designer
project-name: 'sdc-sdc-workflow-designer'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -34,3 +33,13 @@
mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-sdc-workflow-designer-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdc/sdc-workflow-designer
+ project-name: 'sdc-sdc-workflow-designer'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'sdc-sdc-workflow-designer-settings'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index bbe8a171e..14b106afa 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -16,9 +16,6 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
- - gerrit-maven-clm:
- build-timeout: 120
- mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
project: 'sdc'
stream:
- 'master':
@@ -42,3 +39,16 @@
mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+
+- project:
+ name: sdc-clm
+ jobs:
+ - gerrit-maven-clm:
+ build-timeout: 120
+ submodule-timeout: 30
+ mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+ project: sdc
+ project-name: 'sdc'
+ build-node: ubuntu1604-docker-8c-8g
+ branch: 'master'
+ mvn-settings: 'sdc-settings'