From: Thanh Ha Date: Sat, 9 Jul 2016 15:55:13 +0000 (-0400) Subject: Convert periodic job to be regular jjb template X-Git-Tag: release/beryllium-sr3~191 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=11285f3b99093838a23198c6ab977fe1494f49fe;p=releng%2Fbuilder.git Convert periodic job to be regular jjb template Change-Id: I281c9087a98c2152c3f68911d416950d292f518a Signed-off-by: Thanh Ha --- diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml index 011542c00..1c70c870d 100644 --- 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 101590d6c..66e5c74fb 100644 --- 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 26a98b7fa..b1ad0aa2f 100644 --- 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 54f9c71a0..20ca05e4e 100644 --- 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 dd320b9af..a0ba397bf 100644 --- 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 da8ff406c..8b891f18d 100644 --- 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") ##################