From: Sam Hague Date: Fri, 15 Apr 2016 21:16:44 +0000 (-0400) Subject: Add distribution-check for ovsdb X-Git-Tag: release/beryllium-sr2~38 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=69139fa9ce2d2f2d8c980ae524d04d9f27c117ef Add distribution-check for ovsdb Change-Id: I82b4ed5c59bf2c6590b58370c4d6da523492105f Signed-off-by: Sam Hague --- diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg index 6b17ca377..79ea600b5 100644 --- a/jjb/ovsdb/ovsdb.cfg +++ b/jjb/ovsdb/ovsdb.cfg @@ -11,5 +11,5 @@ STREAMS: branch: stable/lithium jdks: openjdk7 distribution-check: false -DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron -JOB_TEMPLATES: verify,merge,periodic,distribution,integration +DEPENDENCIES: odlparent,controller,yangtools +JOB_TEMPLATES: verify,merge,periodic,distribution,distribution-check,integration diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index ee4fd8aa1..0bacf3734 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -10,6 +10,7 @@ - 'ovsdb-merge-{stream}' - 'ovsdb-periodic-{stream}' - 'ovsdb-distribution-{stream}' + - 'ovsdb-distribution-check-{stream}' - 'ovsdb-integration-{stream}' - 'ovsdb-clm-{stream}' - 'ovsdb-validate-autorelease-{stream}' @@ -361,6 +362,110 @@ unique-version: true deploy-unstable: false +# Template: integration-patch-distribution-{stream} +# Goal: Build a patch and make sure the distribution can deploy with this change +# Operation: This job template builds a patch, creates a distribution containing +# the patch, and triggers the distribution deploy test + +- job-template: + name: 'ovsdb-distribution-check-{stream}' + disabled: '{obj:disable_distribution_check}' + + project-type: maven + node: dynamic_verify + concurrent: true + jdk: '{jdk}' + + logrotate: + daysToKeep: '14' + numToKeep: '10' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - gerrit-project-parameter: + project: '{project}' + - gerrit-refspec-parameter: + refspec: '{branch}' + - project-parameter: + project: '{project}' + - integration-distribution-git-url + + scm: + - integration-gerrit-scm: + credentials-id: '{ssh-credentials}' + basedir: '$GERRIT_PROJECT' + refspec: '$GERRIT_REFSPEC' + branch: '{branch}' + - integration-distribution-scm: + credentials-id: '{ssh-credentials}' + branch: '{branch}' + + wrappers: + - build-timeout + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + + triggers: + - gerrit: + server-name: 'OpenDaylight' + trigger-on: + - patchset-created-event: + exclude-drafts: 'true' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'true' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'test-distribution' + - comment-added-contains-event: + comment-contains-value: 'reverify' + - comment-added-contains-event: + comment-contains-value: 'recheck' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + + prebuilders: + - wipe-org-opendaylight-repo + - maven-target: + maven-version: '{mvn33}' + pom: '$GERRIT_PROJECT/pom.xml' + goals: 'clean install -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}' + java-opts: + - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + settings: '{ovsdb-settings}' + global-settings: '{odl-global-settings}' + + maven: + maven-name: '{mvn33}' + root-pom: 'distribution/pom.xml' + goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + settings: '{ovsdb-settings}' + global-settings: '{odl-global-settings}' + ignore-upstream-changes: true + post-step-run-condition: 'SUCCESS' + + postbuilders: + - integration-distribution-check + + publishers: + - archive: + artifacts: 'karaf.log' + - archive: + artifacts: 'karaf_console.log' + - email-notification: + email-prefix: '[ovsdb]' + - job-template: name: 'ovsdb-integration-{stream}' disabled: false @@ -403,7 +508,7 @@ triggers: - reverse: - jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}' + jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' result: 'success' prebuilders: @@ -426,7 +531,7 @@ publishers: - email-notification: - email-prefix: '[ovsdb] [odlparent] [controller] [yangtools] [openflowplugin] [neutron]' + email-prefix: '[ovsdb] [odlparent] [controller] [yangtools]' - jacoco-report - job-template: