summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-19 16:25:29 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-23 21:37:11 +0000
commit9f56b9aaeb9e1cbd46b60f6a44bd3eeca2ca1798 (patch)
treebe28f4fdc7160b54d3bc07cbb0c2ffdf7ef77d2b
parent99297e2838a98b3cdeb687634b1c478d457c197b (diff)
MUSIC-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: I7c6c2e167f86c4d66d45adddbbed256e3c798d83 Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/music/music-jar.yaml12
-rw-r--r--jjb/music/music-prom.yaml10
-rw-r--r--jjb/music/music-trigger.yaml12
-rw-r--r--jjb/music/music.yaml10
4 files changed, 38 insertions, 6 deletions
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 457042a6c..6f83f0fd3 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -7,8 +7,6 @@
pom: 'jar/pom.xml'
pattern: 'jar/**'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f jar/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
project: 'music'
@@ -24,3 +22,13 @@
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: music-jar-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f jar/pom.xml'
+ project: music
+ project-name: 'music-jar'
+ branch: 'master'
+ mvn-settings: 'music-settings'
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 3e2031a17..1e48b35ae 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -3,7 +3,6 @@
name: music-prom
project-name: 'music-prom'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -20,3 +19,12 @@
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: music-prom-clm
+ jobs:
+ - gerrit-maven-clm
+ project: music/prom
+ project-name: 'music-prom'
+ branch: 'master'
+ mvn-settings: 'music-prom-settings'
diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml
index aa52bec61..bf33832d9 100644
--- a/jjb/music/music-trigger.yaml
+++ b/jjb/music/music-trigger.yaml
@@ -7,8 +7,6 @@
pom: 'musictrigger/pom.xml'
pattern: 'musictrigger/**'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f musictrigger/pom.xml assembly:single'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
project: 'music'
@@ -20,3 +18,13 @@
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: music-trigger-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f musictrigger/pom.xml assembly:single'
+ project: music
+ project-name: 'music-trigger'
+ branch: 'master'
+ mvn-settings: 'music-settings'
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 2fe2702e5..43fe66524 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -3,7 +3,6 @@
name: music
project-name: 'music'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -35,3 +34,12 @@
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: music-clm
+ jobs:
+ - gerrit-maven-clm
+ project: music
+ project-name: 'music'
+ branch: 'master'
+ mvn-settings: 'music-settings'