summaryrefslogtreecommitdiffstats
path: root/jjb/modeling
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-19 16:15:50 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-23 21:35:26 +0000
commit0bca79e00b2885f96d38723a8b746beb16d1e636 (patch)
tree3252fe493d5f262bb82aa68fd6f5c579dba8bb0e /jjb/modeling
parent99297e2838a98b3cdeb687634b1c478d457c197b (diff)
MOD-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: I9ab50b7be18dd8288106e72231c60f1686c3b14a Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'jjb/modeling')
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml13
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml12
2 files changed, 21 insertions, 4 deletions
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 798ee14de..03bc2d9bb 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -14,8 +14,6 @@
pattern: 'javatoscachecker/**'
pom: 'javatoscachecker/pom.xml'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f javatoscachecker/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -42,3 +40,14 @@
mvn-settings: 'modeling-toscaparsers-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: modeling-toscaparsers-javatoscachecker-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f javatoscachecker/pom.xml'
+ project: modeling/toscaparsers
+ project-name: 'modeling-toscaparsers-javatoscachecker'
+ build-node: ubuntu1604-docker-8c-8g
+ branch: 'master'
+ mvn-settings: 'modeling-toscaparsers-settings'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 25a72c72e..e10e24d6e 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -15,8 +15,6 @@
pom: 'nfvparser/pom.xml'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- - gerrit-maven-clm:
- mvn-params: '-f nfvparser/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -34,3 +32,13 @@
mvn-settings: 'modeling-toscaparsers-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: modeling-toscaparsers-nfvparser-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f nfvparser/pom.xml'
+ project: modeling/toscaparsers
+ project-name: 'modeling-toscaparsers-nfvparser'
+ branch: 'master'
+ mvn-settings: 'modeling-toscaparsers-settings'