Merge "Fix dovetail docker daily job"

diff --git a/jjb/global-jjb b/jjb/global-jjb
index edf56a1..9f237eb 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit edf56a1e9ce91d936388621ecfc850162aabfebd
+Subproject commit 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7

diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
new file mode 100644 (file)
index 0000000..dba2ab2
--- /dev/null
+++ b/jjb/music/music-jar.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+    name: music-jar
+    project-name: 'music'
+    subproject:
+      - 'music-jar':
+          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'
+    stream:
+      - 'release-2.5.3':
+          branch: 'release-2.5.3'
+    mvn-settings: 'music-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+

diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index bfd7099..632bc8e 100644 (file)
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -88,7 +88,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: staging
@@ -121,7 +121,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: release
@@ -155,7 +155,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: staging
@@ -188,7 +188,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: release

diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index c0d7185..7a57deb 100644 (file)
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -16,3 +16,16 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
+- project:
+    name: vvp-validation-scripts-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'vvp/validation-scripts'
+    project-name: 'vvp-validation-scripts'
+    branch: 'master'
+    mvn-settings: 'vvp-validation-scripts-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+