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>

4 files changed, 25 insertions, 9 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
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 2651670a0..f0663bc1f 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -13,7 +13,7 @@
     #     pattern:   ant file-path pattern relative to the workspace used to
     #                trigger the job
 
-    name: '{project}-{stream}-{subproject}-verify-python'
+    name: '{project-name}-{stream}-{subproject}-verify-python'
     path: '$WORKSPACE'
 
     project-type: freestyle
diff --git a/jjb/mso/mso-libs.yaml b/jjb/mso/mso-libs.yaml
new file mode 100644
index 000000000..de7b6844c
--- /dev/null
+++ b/jjb/mso/mso-libs.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: mso-libs
+    project-name: 'mso-libs'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project: 'mso/libs'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'mso-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml
index cc1bfa5b8..e475863c8 100644
--- a/jjb/mso/mso.yaml
+++ b/jjb/mso/mso.yaml
@@ -1,9 +1,10 @@
 ---
 - project:
     name: mso
+    project-name: 'mso'
     jobs:
-      - '{project}-{stream}-verify-java'
-      - '{project}-{stream}-merge-java'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
 
     project: 'mso'
     stream: