summaryrefslogtreecommitdiffstats
path: root/jjb/global-templates-java.yaml
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2017-01-31 05:50:39 -0800
committerAndrew Grimberg <agrimberg@linuxfoundation.org>2017-01-31 07:38:33 -0800
commitce2286c65d5dcff65202ba5763341068a1a8622a (patch)
tree62ae5427d5a525cb722d6bea4c9e1d7261fae92d /jjb/global-templates-java.yaml
parent30e2264675c282746d3a665c4375ca9839816d72 (diff)
Add mso/libs project job definitions
Use the mso maven settings configuration for now as we have yet to get an mso-libs definition in the system and mso will cover it for groupId namespace. Additionally fix the job templates to use a project-name and project variables instead of a single project variable as projects that have a '/' in their name break job names in Jenkins Change-Id: I1605599f96eab45e72b885b6abe2ea8f3865808d Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb/global-templates-java.yaml')
-rw-r--r--jjb/global-templates-java.yaml12
1 files changed, 6 insertions, 6 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 75aa97f8c..4c77aef54 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -8,7 +8,7 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project}-{stream}-verify-java'
+ name: '{project-name}-{stream}-verify-java'
project-type: freestyle
concurrent: true
@@ -69,7 +69,7 @@
# pattern: ant file-path pattern relative to the workspace used to
# trigger the job
- name: '{project}-{stream}-{subproject}-verify-java'
+ name: '{project-name}-{stream}-{subproject}-verify-java'
project-type: freestyle
concurrent: true
@@ -127,7 +127,7 @@
#
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project}-{stream}-merge-java'
+ name: '{project-name}-{stream}-merge-java'
project-type: freestyle
node: '{build-node}'
@@ -166,7 +166,7 @@
- maven-target:
maven-version: 'mvn33'
# yamllint disable rule:line-length
- goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.open-o.org'
+ goals: 'clean deploy'
# yamllint enable
settings: '{mvn-settings}'
settings-type: cfp
@@ -189,7 +189,7 @@
# pattern: ant file-path pattern relative to the workspace used to
# trigger the job
- name: '{project}-{stream}-{subproject}-merge-java'
+ name: '{project-name}-{stream}-{subproject}-merge-java'
project-type: freestyle
node: '{build-node}'
@@ -229,7 +229,7 @@
maven-version: 'mvn33'
pom: '{pom}'
# yamllint disable rule:line-length
- goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.open-o.org'
+ goals: 'clean deploy'
# yamllint enable
settings: '{mvn-settings}'
settings-type: cfp