Add customer netvirt-sonar job

Change-Id: I2a5b7d356a4f3393c4f565052f3f36dd18f981c3
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
new file mode 100644 (file)
index 0000000..c8c2d70
--- /dev/null
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -0,0 +1,83 @@
+- project:
+    name: netvirt-sonar
+    jobs:
+        - 'netvirt-sonar'
+
+    project: 'netvirt'
+    jdk: 'openjdk8'
+
+- job-template:
+    name: 'netvirt-sonar'
+
+    project-type: maven
+    node: dynamic_docker
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '7'
+        numToKeep: '10'
+        artifactDaysToKeep: '1'
+        artifactNumToKeep: '1'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * 6'
+        - gerrit-trigger-patch-sonar:
+            name: 'netvirt'
+
+    prebuilders:
+        - shell:
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{netvirt-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - inject:
+            properties-file: env.properties
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'verify -V -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            properties:
+                - 'ovsdbserver.ipaddress=127.0.0.1'
+                - 'ovsdbserver.port=6641'
+                - 'ovsdb.userspace.enabled=yes'
+            settings: '{netvirt-settings}'
+            global-settings: '{odl-global-settings}'
+        - shell:
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
+    publishers:
+        - sonar:
+            language: 'java'
+            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
+        - email-notification:
+            email-prefix: '[netvirt]'
+        - jacoco-report

diff --git a/jjb/netvirt/netvirt.cfg b/jjb/netvirt/netvirt.cfg
index 4eb49df3ab485bdb7e2e241e78ec66f89110e4d0..744ffd73cbb46813ce5f29685f5cecad931e4ef0 100644 (file)
--- a/jjb/netvirt/netvirt.cfg
+++ b/jjb/netvirt/netvirt.cfg
@@ -12,3 +12,4 @@ STREAMS:
     jdks: openjdk7
     distribution-check: false
 DEPENDENCIES: controller,neutron,odlparent,openflowjava,openflowplugin,ovsdb,sfc,yangtools
+JOB_TEMPLATES: verify,merge,periodic,distribution,distribution-check,integration

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 00acaf3b8d37fd6753216bad51d128f82a443cba..29dc751d57786ef7955f01a9b5c653b86f944a14 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -12,7 +12,6 @@
         - 'netvirt-distribution-{stream}'
         - 'netvirt-distribution-check-{stream}'
         - 'netvirt-integration-{stream}'
-        - 'netvirt-sonar'
         - 'netvirt-clm-{stream}'
         - 'netvirt-validate-autorelease-{stream}'
 
@@ -535,67 +534,6 @@
             email-prefix: '[netvirt] [controller] [neutron] [odlparent] [openflowjava] [openflowplugin] [ovsdb] [sfc] [yangtools]'
         - jacoco-report
 
-- job-template:
-    name: 'netvirt-sonar'
-    disabled: false
-
-    project-type: maven
-    node: dynamic_verify
-    jdk: 'openjdk8'
-
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '10'
-        artifactDaysToKeep: '1'
-        artifactNumToKeep: '1'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: 'master'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H H * * 6'
-        - gerrit-trigger-patch-sonar:
-            name: 'netvirt'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{netvirt-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -Dsonar'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{netvirt-settings}'
-        global-settings: '{odl-global-settings}'
-
-    reporters:
-        - findbugs
-
-    publishers:
-        - sonar:
-            language: 'java'
-            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
-        - email-notification:
-            email-prefix: '[netvirt]'
-        - jacoco-report
-
 - job-template:
     name: 'netvirt-clm-{stream}'
     disabled: false