summaryrefslogtreecommitdiffstats
path: root/jjb/optf
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-19 16:32:07 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-23 21:37:49 +0000
commit16407aca77eefb705fbc54a707747bd7944f5c60 (patch)
tree7ac563ce7d4ade2320d9f921d22caeb51ead8665 /jjb/optf
parent99297e2838a98b3cdeb687634b1c478d457c197b (diff)
OPTF-Refactor CLM project block
The clm job portion needs to be on its own project section similar to the Sonar portion. The reason behind this, is because we only want this job to be running for master and no other branches. Also, this is in preparation for the work that is to come from global-jjb on application names in CLM. Change-Id: If4e6bc2643f8ef1f0c57b8ff737261b7e65e7fe0 Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'jjb/optf')
-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 788e75217..8780cee32 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':
@@ -48,3 +46,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'