X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-distribution-jobs.yaml;h=00127f5747a9776773468980390a9cebbb64e867;hb=refs%2Fchanges%2F30%2F40030%2F1;hp=b3031fbf3ab4de5b56f75017c2a5b5c2733e7c4d;hpb=263eba1029d68dd735cbfa46180638589b0255ee;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index b3031fbf3..00127f574 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -1,24 +1,25 @@ - project: - name: integration-distribution-jobs + name: integration-distribution jobs: + - '{name}-verify-python-{stream}' - 'integration-distribution-verify-{stream}' - 'integration-distribution-merge-{stream}' - 'integration-distribution-deploy-{stream}' - 'integration-distribution-offline-{stream}' - - 'integration-patch-distribution-{stream}' + + project: integration/distribution stream: - - beryllium: + - boron: branch: 'master' - + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' - stable-lithium: branch: 'stable/lithium' - - - stable-helium: - branch: 'stable/helium' - - jdk: 'openjdk7' + jre: 'openjdk7' - job-template: @@ -27,7 +28,7 @@ project-type: maven node: dynamic_verify concurrent: true - jdk: '{jdk}' + jdk: '{jre}' logrotate: daysToKeep: '{build-days-to-keep}' @@ -38,8 +39,10 @@ parameters: - project-parameter: project: 'integration/distribution' - - gerrit-parameter: + - gerrit-parameters: + project: '{project}' branch: '{branch}' + refspec: 'refs/heads/{branch}' - integration-patch-refspec: branch: '$GERRIT_REFSPEC' @@ -65,11 +68,14 @@ - inject: properties-file: 'bundle.txt' - wipe-org-opendaylight-repo + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{integration-settings}' maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar' + goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: '{integration-settings}' global-settings: '{odl-global-settings}' @@ -92,7 +98,7 @@ project-type: maven node: dynamic_merge - jdk: '{jdk}' + jdk: '{jre}' logrotate: daysToKeep: '{build-days-to-keep}' @@ -103,6 +109,10 @@ parameters: - project-parameter: project: 'integration/distribution' + - gerrit-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' scm: - gerrit-trigger-scm: @@ -123,11 +133,14 @@ prebuilders: - wipe-org-opendaylight-repo + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{integration-settings}' maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar' + goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: '{integration-settings}' global-settings: '{odl-global-settings}' @@ -148,13 +161,14 @@ name: 'integration-distribution-deploy-{stream}' project-type: freestyle - node: dynamic_controller + node: dynamic_verify + concurrent: true logrotate: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + artifactNumToKeep: '{build-num-to-keep}' parameters: - project-parameter: @@ -163,6 +177,8 @@ branch: '{branch}' - integration-bundleurl: bundleurl: 'last' + - integration-jdk-version: + jdkversion: '{jre}' wrappers: - build-timeout @@ -181,7 +197,7 @@ publishers: - archive: - artifacts: 'karaf.log' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[integration]' @@ -193,13 +209,13 @@ name: 'integration-distribution-offline-{stream}' project-type: freestyle - node: dynamic_controller + node: dynamic_verify logrotate: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + artifactNumToKeep: '{build-num-to-keep}' parameters: - project-parameter: @@ -208,6 +224,8 @@ branch: '{branch}' - integration-bundleurl: bundleurl: 'last' + - integration-jdk-version: + jdkversion: '{jre}' wrappers: - build-timeout @@ -226,103 +244,6 @@ publishers: - archive: - artifacts: 'karaf.log' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[integration]' - -# 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: 'integration-patch-distribution-{stream}' - - project-type: maven - node: dynamic_verify - jdk: '{jdk}' - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - gerrit-project-parameter: - project: '$GERRIT_PROJECT' - - gerrit-refspec-parameter: - refspec: '$GERRIT_REFSPEC' - - project-parameter: - project: '$GERRIT_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: - - comment-added-contains-event: - comment-contains-value: 'test-distribution' - projects: - - project-compare-type: 'ANT' - project-pattern: '**' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - prebuilders: - - integration-get-bundle-url - - inject: - properties-file: 'bundle.txt' - - wipe-org-opendaylight-repo - - maven-target: - maven-version: '{mvn33}' - pom: '$GERRIT_PROJECT/pom.xml' - goals: 'clean install -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' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: '{integration-settings}' - global-settings: '{odl-global-settings}' - - maven: - maven-name: '{mvn33}' - root-pom: 'distribution/pom.xml' - goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' - maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - settings: '{integration-settings}' - global-settings: '{odl-global-settings}' - ignore-upstream-changes: true - post-step-run-condition: 'SUCCESS' - - postbuilders: - - trigger-builds: - - project: 'integration-distribution-deploy-{stream}' - block: true - predefined-parameters: - BUNDLEURL=$BUNDLEURL - - publishers: - - email-notification: - email-prefix: '[$GERRIT_PROJECT]' -