summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/appc/appc-cdt.yaml11
-rw-r--r--jjb/appc/appc-deployment.yaml11
-rw-r--r--jjb/appc/appc-master.yaml16
-rw-r--r--jjb/holmes/holmes-common.yaml10
-rw-r--r--jjb/holmes/holmes-dsa.yaml10
-rw-r--r--jjb/holmes/holmes-engine-mgt.yaml10
-rw-r--r--jjb/holmes/holmes-rule-mgt.yaml10
7 files changed, 68 insertions, 10 deletions
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index be7e1f71a..c610857cb 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -3,7 +3,6 @@
name: appc-cdt
project-name: 'appc-cdt'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -16,3 +15,13 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: appc-cdt-clm
+ jobs:
+ - gerrit-maven-clm
+ project: 'appc/cdt'
+ project-name: 'appc-cdt'
+ branch: 'master'
+ mvn-settings: 'appc-cdt-settings'
+
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index a863e6ef3..fc4567a09 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -4,7 +4,6 @@
name: appc-deployment
project-name: 'appc-deployment'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -39,3 +38,13 @@
docker-pom: 'pom.xml'
mvn-profile: docker
build-node: queue-docker-4c-4g
+
+- project:
+ name: appc-deployment-clm
+ jobs:
+ - gerrit-maven-clm
+ project: 'appc/deployment'
+ project-name: 'appc-deployment'
+ branch: 'master'
+ mvn-settings: 'appc-deployment-settings'
+
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index ed973ec57..1fdba4d9f 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -3,10 +3,6 @@
name: appc-master
project-name: 'appc'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-DskipTests'
- build-timeout: 30
- build-node: ubuntu1604-builder-8c-8g
- '{project-name}-{stream}-verify-java':
build-node: ubuntu1604-builder-8c-8g
- '{project-name}-{stream}-merge-java':
@@ -35,3 +31,15 @@
mvn-settings: 'appc-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx4096m'
+
+- project:
+ name: appc-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-DskipTests'
+ build-timeout: 30
+ build-node: ubuntu1604-builder-8c-8g
+ project: 'appc'
+ project-name: 'appc'
+ branch: 'master'
+ mvn-settings: 'appc-settings'
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 9d7f34be1..559f1d577 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -3,7 +3,6 @@
name: holmes-common
project-name: 'holmes-common'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -29,3 +28,12 @@
mvn-settings: 'holmes-common-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: holmes-common-clm
+ jobs:
+ - gerrit-maven-clm
+ project: holmes/common
+ project-name: 'holmes-common'
+ branch: 'master'
+ mvn-settings: 'holmes-common-settings'
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index 8a014be81..79b4fe663 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -3,7 +3,6 @@
name: holmes-dsa
project-name: 'holmes-dsa'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,12 @@
mvn-settings: 'holmes-dsa-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: holmes-dsa-clm
+ jobs:
+ - gerrit-maven-clm
+ project: holmes/dsa
+ project-name: 'holmes-dsa'
+ branch: 'master'
+ mvn-settings: 'holmes-dsa-settings'
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index cd4e71c4e..77888cc15 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -3,7 +3,6 @@
name: holmes-engine-management
project-name: 'holmes-engine-management'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,12 @@
mvn-settings: 'holmes-engine-management-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: holmes-engine-management-clm
+ jobs:
+ - gerrit-maven-clm
+ project: holmes/engine-management
+ project-name: 'holmes-engine-management'
+ branch: 'master'
+ mvn-settings: 'holmes-engine-management-settings'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index ee7815856..42d14daca 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -3,7 +3,6 @@
name: holmes-rule-management
project-name: 'holmes-rule-management'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,12 @@
mvn-settings: 'holmes-rule-management-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: holmes-rule-management-clm
+ jobs:
+ - gerrit-maven-clm
+ project: holmes/rule-management
+ project-name: 'holmes-rule-management'
+ branch: 'master'
+ mvn-settings: 'holmes-rule-management-settings'