Convert periodic job to be regular jjb template

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

diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml
index 011542c00ab886a15fbf2bd2d1589b013d4bdd84..1c70c870dafcca79a835c2b3911f08e3192924e6 100644 (file)
--- a/jjb-templates/project.yaml
+++ b/jjb-templates/project.yaml
@@ -10,6 +10,7 @@
         - '{name}-distribution-{stream}'
         - '{name}-distribution-check-{stream}'
         - '{name}-integration-{stream}'
+        - '{name}-periodic-{stream}'
         - '{name}-validate-autorelease-{stream}'
 JOB_TEMPLATES
 

diff --git a/jjb/netvirt/netvirt.cfg b/jjb/netvirt/netvirt.cfg
index 101590d6c5b9be6fd9c73b75c8186129659434e4..66e5c74fbd5cd92ab651319237eef4040676d943 100644 (file)
--- a/jjb/netvirt/netvirt.cfg
+++ b/jjb/netvirt/netvirt.cfg
@@ -8,4 +8,4 @@ STREAMS:
     jdks: openjdk7,openjdk8
     autorelease: true
 DEPENDENCIES: controller,neutron,odlparent,openflowjava,openflowplugin,ovsdb,sfc,yangtools
-JOB_TEMPLATES: verify,merge,periodic
+JOB_TEMPLATES: verify,merge

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 26a98b7fa13ec733ec37a9c7859c166b7960f4f0..b1ad0aa2f2d7b0c57e9c5476f574a5eeb24d4522 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -12,4 +12,4 @@ STREAMS:
     jdks: openjdk7
     distribution-check: false
 DEPENDENCIES: odlparent,controller,yangtools
-JOB_TEMPLATES: verify,merge,periodic
+JOB_TEMPLATES: verify,merge

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 54f9c71a052f7ebc810228aa2320703048774dae..20ca05e4e306d562aea301dcdab36ccb8f97b414 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -294,6 +294,66 @@
         - archive-build:
             maven-version: '{mvn33}'
 
+- job-template:
+    name: '{name}-periodic-{stream}'
+
+    # Job template for periodic builders
+    #
+    # The purpose of this job template is to setup a periodic
+    # builder.
+    #
+    # Required Variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '14'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - timed: '@daily'
+
+    prebuilders:
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: '{mvn-settings}'
+
+    maven:
+        maven-name: '{mvn33}'
+        goals: '{mvn-goals} -V -B -Djenkins'
+        maven-opts: '{mvn-opts}'
+        settings: '{mvn-settings}'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
+
+    reporters:
+        - findbugs
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{name}]'
+        - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
+
 - job-template:
     name: '{name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index dd320b9af38e2261b99ae0bfcdffd412e9162525..a0ba397bfa046c8441afe9ff28d18e61f6fdc22e 100644 (file)
--- a/jjb/yangtools/yangtools.cfg
+++ b/jjb/yangtools/yangtools.cfg
@@ -12,4 +12,4 @@ STREAMS:
     jdks: openjdk7,openjdk8
     distribution-check: false
 DEPENDENCIES: odlparent
-JOB_TEMPLATES: merge,periodic,sonar
+JOB_TEMPLATES: merge,sonar

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index da8ff406c869925a8f829b3c5f7fab4b36b06a93..8b891f18d4bec1a124027eea816430e18a49d45f 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -58,7 +58,7 @@ if cfg.get("JOB_TEMPLATES"):
     templates = cfg.get("JOB_TEMPLATES")
 else:
     templates = (
-        "verify,merge,periodic,"
+        "verify,merge,"
         "sonar")
 
 ##################