summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnil Belur <abelur@linuxfoundation.org>2018-10-23 21:48:07 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-23 21:48:07 +0000
commitf111cee189b62ca0dc7a7abf24cd69cdf918b18c (patch)
tree6564fc40e0a3519c233beeb343363e4e93ae832a
parentb8dc611f81fad3b1d921754fc5262ca35b2959ad (diff)
parent16407aca77eefb705fbc54a707747bd7944f5c60 (diff)
Merge "OPTF-Refactor CLM project block"
-rw-r--r--jjb/optf/optf-cmso.yaml13
-rw-r--r--jjb/optf/optf-has.yaml10
-rw-r--r--jjb/optf/optf-osdf.yaml10
3 files changed, 29 insertions, 4 deletions
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 39253cd9e..77d797a71 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -4,8 +4,6 @@
name: optf-cmso
project-name: 'optf-cmso'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
- '{project-name}-{stream}-verify-java-checkstyle':
mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
- '{project-name}-{stream}-merge-properties-java':
@@ -49,3 +47,14 @@
mvn-settings: 'optf-cmso-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: optf-cmso-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+ project: optf/cmso
+ project-name: 'optf-cmso'
+ build-node: ubuntu1604-docker-8c-8g
+ branch: 'master'
+ mvn-settings: 'optf-cmso-settings'
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 6860822ff..945e3d208 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -15,7 +15,6 @@
pattern: 'conductor/**'
pom: 'pom.xml'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-verify-java'
@@ -68,3 +67,12 @@
mvn-settings: 'optf-has-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: optf-has-clm
+ jobs:
+ - gerrit-maven-clm
+ project: optf/has
+ project-name: 'optf-has'
+ branch: 'master'
+ mvn-settings: 'optf-has-settings'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 8cc048db4..6c6e2fc8b 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -15,7 +15,6 @@
pattern: '**'
pom: 'pom.xml'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
@@ -67,3 +66,12 @@
mvn-settings: 'optf-osdf-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: optf-osdf-clm
+ jobs:
+ - gerrit-maven-clm
+ project: optf/osdf
+ project-name: 'optf-osdf'
+ branch: 'master'
+ mvn-settings: 'optf-osdf-settings'