Merge "add custom verify job for netvirt/routermanager stream"

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

diff --git a/jjb/ovsdb/ovsdb-custom.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
similarity index 97%
rename from jjb/ovsdb/ovsdb-custom.yaml
rename to jjb/ovsdb/ovsdb-sonar.yaml
index 66390b0d761c9cb1f642d1d2b6c9cb665539d308..eb940b32fa237b746968e1a66e820f399b777a74 100644 (file)
--- a/jjb/ovsdb/ovsdb-custom.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: ovsdb-custom
+    name: ovsdb-sonar
     jobs:
         - 'ovsdb-sonar'
 
@@ -36,7 +36,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: '@weekly'
+        - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
             name: 'ovsdb'
 

diff --git a/jjb/ovsdb/ovsdb-verify-custom.yaml b/jjb/ovsdb/ovsdb-verify-custom.yaml
deleted file mode 100644 (file)
index e26c28a..0000000
--- a/jjb/ovsdb/ovsdb-verify-custom.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-- project:
-    name: ovsdb-verify-custom
-    jobs:
-        - 'ovsdb-verify-{stream}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - routermanager:
-            branch: 'topic/routermanager'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-        - clustering-netvirt-master:
-            branch: 'topic/master/net-virt-clustering'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-
-    project: 'ovsdb'

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 6b17ca377b0d0a96bed20032147b872f7022e028..79ea600b5bc555fd4af6a6e609daea10606b3566 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -11,5 +11,5 @@ STREAMS:
     branch: stable/lithium
     jdks: openjdk7
     distribution-check: false
-DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,periodic,distribution,integration
+DEPENDENCIES: odlparent,controller,yangtools
+JOB_TEMPLATES: verify,merge,periodic,distribution,distribution-check,integration

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index ee4fd8aa1bbd1fe743752ab3ecd34e5f7f9f5805..0bacf37343c64d66e4e2a1de4b745561025f4c84 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -10,6 +10,7 @@
         - 'ovsdb-merge-{stream}'
         - 'ovsdb-periodic-{stream}'
         - 'ovsdb-distribution-{stream}'
+        - 'ovsdb-distribution-check-{stream}'
         - 'ovsdb-integration-{stream}'
         - 'ovsdb-clm-{stream}'
         - 'ovsdb-validate-autorelease-{stream}'
@@ -361,6 +362,110 @@
             unique-version: true
             deploy-unstable: false
 
+# Template: integration-patch-distribution-{stream}
+# Goal: Build a patch and make sure the distribution can deploy with this change
+# Operation: This job template builds a patch, creates a distribution containing
+#            the patch, and triggers the distribution deploy test
+
+- job-template:
+    name: 'ovsdb-distribution-check-{stream}'
+    disabled: '{obj:disable_distribution_check}'
+
+    project-type: maven
+    node: dynamic_verify
+    concurrent: true
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '14'
+        numToKeep: '10'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - gerrit-project-parameter:
+            project: '{project}'
+        - gerrit-refspec-parameter:
+            refspec: '{branch}'
+        - project-parameter:
+            project: '{project}'
+        - integration-distribution-git-url
+
+    scm:
+        - integration-gerrit-scm:
+            credentials-id: '{ssh-credentials}'
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
+            branch: '{branch}'
+        - integration-distribution-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-distribution'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{name}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: false
+                failed: false
+                unstable: false
+                notbuilt: false
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: '$GERRIT_PROJECT/pom.xml'
+            goals: 'clean install -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            settings: '{ovsdb-settings}'
+            global-settings: '{odl-global-settings}'
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'distribution/pom.xml'
+        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{ovsdb-settings}'
+        global-settings: '{odl-global-settings}'
+        ignore-upstream-changes: true
+        post-step-run-condition: 'SUCCESS'
+
+    postbuilders:
+        - integration-distribution-check
+
+    publishers:
+        - archive:
+            artifacts: 'karaf.log'
+        - archive:
+            artifacts: 'karaf_console.log'
+        - email-notification:
+            email-prefix: '[ovsdb]'
+
 - job-template:
     name: 'ovsdb-integration-{stream}'
     disabled: false
@@ -403,7 +508,7 @@
 
     triggers:
         - reverse:
-            jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}'
+            jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
             result: 'success'
 
     prebuilders:
@@ -426,7 +531,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[ovsdb] [odlparent] [controller] [yangtools] [openflowplugin] [neutron]'
+            email-prefix: '[ovsdb] [odlparent] [controller] [yangtools]'
         - jacoco-report
 
 - job-template: