Add new verify job type using freestyle project

Helps us move away from matrix jobs into freestyle project type. We want
to move away from Matrix jobs as we're finding that matrix systems have
issues with handling the job queue correctly.

Also adds support to choose build node.

Change-Id: I80888481d0a422ae82b2c108f990116c81ea1303
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 2b5e649c856f604cc5cd99ae7f3d35865e546209..3fb96db5150909fd1d921b2b717a565203eef272 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -9,6 +9,7 @@
     build-artifact-num-to-keep: 5
     # Timeout in minutes
     build-timeout: 360
+    build-node: dynamic_verify
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 52163720ca7b4098c4c40a4a082f2ad9d4515cab..9af4dbccb0173401f5e7a11226b224d9dc854db0 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -714,3 +714,66 @@
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
+
+- job-template:
+    name: '{name}-verify-{stream}-{maven}-{jdk}'
+
+    # Job template for ODL verify jobs
+    #
+    # The purpose of this job template is to setup a ODL verify job
+    #
+    # Required Variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '7'
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
+
+    scm:
+        - gerrit-trigger-scm:
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: '{mvn-settings}'
+        - maven-target:
+            maven-version: '{mvn-version}'
+            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream}'
+            java-opts:
+                - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+    publishers:
+        - findbugs
+        - email-notification:
+            email-prefix: '[{name}]'
+        - jacoco-report
+        - archive-build:
+            maven-version: '{mvn-version}'