From 271b9afae6f21f78958522b00a5a2a17ce28c56a Mon Sep 17 00:00:00 2001 From: Flavio Fernandes Date: Wed, 29 Apr 2015 14:36:26 -0400 Subject: [PATCH] Do not enable openjdk8 for controller stable/helium branch This patch creates 2 custom verify templates for controller so that we do not force openjdk8 onto the Helium branch. Change-Id: I82ffd7f0a8b4d3b5ae61d0dc9be1e72bcf25122f Ref: https://git.opendaylight.org/gerrit/#/c/18953 Signed-off-by: Flavio Fernandes --- jjb/controller/controller-verify.yaml | 162 ++++++++++++++++++++++++++ jjb/controller/controller.cfg | 2 +- jjb/controller/controller.yaml | 76 ------------ 3 files changed, 163 insertions(+), 77 deletions(-) create mode 100644 jjb/controller/controller-verify.yaml diff --git a/jjb/controller/controller-verify.yaml b/jjb/controller/controller-verify.yaml new file mode 100644 index 000000000..52fb5f580 --- /dev/null +++ b/jjb/controller/controller-verify.yaml @@ -0,0 +1,162 @@ +- project: + name: controller-verify + jobs: + - 'controller-verify-{stream}' + - 'controller-verify-stable-helium' + + + # stream: branch with - in place of / (eg. stable-helium) + # branch: branch (eg. stable/helium) + stream: + - master: + branch: 'master' + - stable-lithium: + branch: 'stable/lithium' + + project: 'controller' + +# For the Job templates below replace instances of: +# PROJECT with your project name (eg. controller) +# MAVEN_GOALS with your maven goals to build +# MAVEN_OPTS with your maven options to build + +- job-template: + name: 'controller-verify-{stream}' + + # Job template for ODL verify jobs + # + # The purpose of this job template is to setup a ODL verify job + # + # Required Variables: + # stream: branch with - in place of / (eg. stable-lithium) + # branch: branch (eg. stable/lithium) + + project-type: matrix + node: matrix_master + concurrent: true + + axes: + - axis: + type: slave + name: nodes + values: + - dynamic_verify + - axis: + type: jdk + values: + - openjdk7 + - openjdk8 + + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - build-timeout + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + + triggers: + - gerrit-trigger-patch-submitted: + name: 'controller' + branch: '{branch}' + + builders: + - wipe-org-opendaylight-repo + - maven-target: + maven-version: '{mvn32}' + pom: 'pom.xml' + goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs' + java-opts: + - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + settings: '{controller-settings}' + global-settings: '{odl-global-settings}' + - jacoco-nojava-workaround + + publishers: + - findbugs + - email-notification: + email-prefix: '[controller]' + - jacoco-report + +- job-template: + name: 'controller-verify-stable-helium' + + project-type: matrix + node: matrix_master + concurrent: true + + axes: + - axis: + type: slave + name: nodes + values: + - dynamic_verify + - axis: + type: jdk + values: + - openjdk7 + + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: 'stable/helium' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - build-timeout + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + + triggers: + - gerrit-trigger-patch-submitted: + name: 'controller' + branch: 'stable/helium' + + builders: + - wipe-org-opendaylight-repo + - maven-target: + maven-version: '{mvn32}' + pom: 'pom.xml' + goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs' + java-opts: + - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + settings: '{controller-settings}' + global-settings: '{odl-global-settings}' + - jacoco-nojava-workaround + + publishers: + - findbugs + - email-notification: + email-prefix: '[controller]' + - jacoco-report diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg index 105f31e62..b2e2fbf40 100644 --- a/jjb/controller/controller.cfg +++ b/jjb/controller/controller.cfg @@ -1,5 +1,5 @@ +JOB_TEMPLATES: merge,daily,integration,sonar BRANCHES: master,stable/helium,stable/lithium MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs MVN_OPTS: -Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true DEPENDENCIES: yangtools,aaa -JDKS: openjdk7,openjdk8 diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index bc3b0a981..a94558b21 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -6,7 +6,6 @@ - project: name: controller jobs: - - 'controller-verify-{stream}' - 'controller-merge-{stream}' - 'controller-daily-{stream}' - 'controller-integration-{stream}' @@ -32,81 +31,6 @@ # MAVEN_GOALS with your maven goals to build # MAVEN_OPTS with your maven options to build -- job-template: - name: 'controller-verify-{stream}' - - # Job template for ODL verify jobs - # - # The purpose of this job template is to setup a ODL verify job - # - # Required Variables: - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) - - project-type: matrix - node: matrix_master - concurrent: true - - axes: - - axis: - type: slave - name: nodes - values: - - dynamic_verify - - axis: - type: jdk - values: - - openjdk7 - - openjdk8 - - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - build-timeout - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - triggers: - - gerrit-trigger-patch-submitted: - name: 'controller' - branch: '{branch}' - - builders: - - wipe-org-opendaylight-repo - - maven-target: - maven-version: '{mvn32}' - pom: 'pom.xml' - goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: '{controller-settings}' - global-settings: '{odl-global-settings}' - - jacoco-nojava-workaround - - publishers: - - findbugs - - email-notification: - email-prefix: '[controller]' - - jacoco-report - - job-template: name: 'controller-merge-{stream}' -- 2.36.6