From 188e52403e1e03349b5469efeb08eb07ec0940c8 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 7 Jul 2015 11:26:09 -0400 Subject: [PATCH] Revert controller verify jobs back to templates With commit 271b9afae we used custom verify jobs to support disabling JDK8 for helium branches but now that JJB supports custom per branch JDK definitions we no longer need to use custom verify jobs. This patch reverts controller back to use the verify templates. Change-Id: I7d5963f2a01d5a5641dfd443bd57e437397b24ec Signed-off-by: Thanh Ha --- jjb/controller/controller-verify.yaml | 162 -------------------------- jjb/controller/controller.cfg | 1 - jjb/controller/controller.yaml | 73 ++++++++++++ 3 files changed, 73 insertions(+), 163 deletions(-) delete mode 100644 jjb/controller/controller-verify.yaml diff --git a/jjb/controller/controller-verify.yaml b/jjb/controller/controller-verify.yaml deleted file mode 100644 index 52fb5f580..000000000 --- a/jjb/controller/controller-verify.yaml +++ /dev/null @@ -1,162 +0,0 @@ -- 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 463063a94..9d49b5b94 100644 --- a/jjb/controller/controller.cfg +++ b/jjb/controller/controller.cfg @@ -1,4 +1,3 @@ -JOB_TEMPLATES: merge,daily,distribution,integration,sonar BRANCHES: - master: jdks: openjdk7,openjdk8 diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 067e7f712..6a33450b2 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -6,6 +6,7 @@ - project: name: controller jobs: + - 'controller-verify-{stream}' - 'controller-merge-{stream}' - 'controller-daily-{stream}' - 'controller-distribution-{stream}' @@ -42,6 +43,78 @@ # 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: '{obj:jdks}' + + 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: '{mvn33}' + 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