X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=08329f7d3edea094ffc2616f6cc626d6f6c5d91c;hb=d445106923840aca19b64d20dde4ed146123d463;hp=888586cc3f8115dca637906561d585d94a08c68e;hpb=3a0bc4e1ca9f9a9e6e92ec1071fa619744ad79e3;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 888586cc3..08329f7d3 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1,9 +1,5 @@ # Job templates in this file (please update with every new template): # -# Old templates: -# {project}-csit-verify-1node-{functionality}-{stream} -# {project}-csit-1node-imds-{functionality}-{install}-{stream} -# # New (for Be release): # {project}-csit-verify-1node-{functionality} # {project}-csit-1node-{functionality}-{install}-{stream} @@ -15,6 +11,7 @@ # Parameters: # # project-parameter: main project integration/test ($PROJECT) +# jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL # integration-branch: distribution branch ($BRANCH) # integration-controller-bundleurl: distribution URL ($BUNDLEURL) # integration-controller-scope: only or all features ($CONTROLLERSCOPE) @@ -24,193 +21,6 @@ # integration-patch-refspec: test branch ($PATCHREFSPEC) - -# Old templates - -- job-template: - name: '{project}-csit-verify-1node-{functionality}-{stream}' - disabled: false - - project-type: freestyle - node: dynamic_robot - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-num-to-keep}' - - parameters: - - project-parameter: - project: 'integration/test' - - integration-branch: - branch: 'master' - - integration-bundleurl: - bundleurl: 'last' - - integration-controller-scope: - controller-scope: 'only' - - integration-controller-features: - controller-features: '{install-features}' - - integration-test-options: - test-options: '{robot-options}' - - integration-test-plan: - test-plan: '{project}-{functionality}.txt' - - integration-jdk-version: - jdkversion: 'openjdk7' - - scm: - - integration-gerrit-scm: - credentials-id: '{ssh-credentials}' - basedir: 'test' - refspec: '$GERRIT_REFSPEC' - branch: 'master' - - wrappers: - - build-timeout - - integration-jclouds-controller-mininet: - controller-vms: 1 - mininet-image: '{mininet-image}' - mininet-vms: '{mininet-vms}' - mininet-cloud-name: '{mininet-cloud-name}' - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - triggers: - - integration-trigger-patch-submitted: - name: 'integration/test' - branch: '{branch}' - pattern: 'csit/suites/{project}/**' - - builders: - - integration-cleanup-workspace - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-get-slave-addresses - - inject: - properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' - - integration-deploy-controller-run-test - - integration-cleanup-tmp - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - archive: - artifacts: 'karaf.log*' - - email-notification: - email-prefix: '[{project}]' - -- job-template: - name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}' - disabled: false - - project-type: freestyle - node: dynamic_robot - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-num-to-keep}' - - parameters: - - project-parameter: - project: 'integration/test' - - integration-branch: - branch: '{branch}' - - integration-bundleurl: - bundleurl: 'last' - - integration-controller-scope: - controller-scope: '{scope}' - - integration-controller-features: - controller-features: '{install-features}' - - integration-test-options: - test-options: '{robot-options}' - - integration-test-plan: - test-plan: '{project}-{functionality}.txt' - - integration-patch-refspec: - branch: 'stable/helium' - - integration-jdk-version: - jdkversion: 'openjdk7' - - scm: - - integration-gerrit-scm: - credentials-id: '{ssh-credentials}' - basedir: 'test' - refspec: '$PATCHREFSPEC' - branch: 'master' - - wrappers: - - build-timeout - - integration-jclouds-controller-mininet: - controller-vms: 1 - mininet-image: '{mininet-image}' - mininet-vms: '{mininet-vms}' - mininet-cloud-name: '{mininet-cloud-name}' - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - - triggers: - - integration-csit-{install}: - jobs: '{trigger-jobs}' - - builders: - - integration-cleanup-workspace - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-get-slave-addresses - - inject: - properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' - - integration-deploy-controller-run-test - - integration-cleanup-tmp - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - archive: - artifacts: 'karaf.log*' - - email-notification: - email-prefix: '[{project}]' - - plot: - - title: '{01-plot-title}' - yaxis: '{01-plot-yaxis}' - group: '{01-plot-group}' - num-builds: '5400' - style: line - use-description: false - csv-file-name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' - keep-records: true - series: - - file: '{01-plot-data-file}' - inclusion-flag: 'off' - display-table: true - format: csv - - title: '{02-plot-title}' - yaxis: '{02-plot-yaxis}' - group: '{02-plot-group}' - num-builds: '5400' - style: line - use-description: false - csv-file-name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' - keep-records: true - series: - - file: '{02-plot-data-file}' - inclusion-flag: 'off' - display-table: true - format: csv - # New templates - job-template: @@ -231,6 +41,8 @@ project: 'integration/test' - integration-branch: branch: 'stable/beryllium' + - integration-distribution-stream: + stream: 'beryllium' - integration-bundleurl: bundleurl: 'last' - integration-controller-scope: @@ -243,6 +55,7 @@ test-plan: '{project}-{functionality}.txt' - integration-jdk-version: jdkversion: 'openjdk7' + # TODO: Switch to openjdk8 from Boron on. scm: - integration-gerrit-scm: @@ -287,7 +100,7 @@ unstable-if: 0.0 pass-if: 100.0 - archive: - artifacts: 'karaf.log*' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[{project}]' @@ -309,6 +122,8 @@ project: 'integration/test' - integration-branch: branch: '{branch}' + - integration-distribution-stream: + stream: '{stream}' - integration-bundleurl: bundleurl: 'last' - integration-controller-scope: @@ -322,7 +137,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jre}' scm: - integration-gerrit-scm: @@ -365,7 +180,7 @@ unstable-if: 0.0 pass-if: 100.0 - archive: - artifacts: 'karaf.log*' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[{project}]' - plot: @@ -412,6 +227,8 @@ project: 'integration/test' - integration-branch: branch: '{branch}' + - integration-distribution-stream: + stream: '{stream}' - integration-bundleurl: bundleurl: 'last' - integration-controller-scope: @@ -425,7 +242,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jre}' scm: - integration-gerrit-scm: @@ -466,7 +283,7 @@ unstable-if: 0.0 pass-if: 100.0 - archive: - artifacts: '*.log,karaf.log*' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[{project}]' - plot: @@ -513,6 +330,8 @@ project: 'integration/test' - integration-branch: branch: 'stable/beryllium' + - integration-distribution-stream: + stream: 'beryllium' - integration-bundleurl: bundleurl: 'last' - integration-controller-scope: @@ -525,6 +344,7 @@ test-plan: '{project}-{functionality}.txt' - integration-jdk-version: jdkversion: 'openjdk7' + # TODO: Switch to openjdk8 from Boron on. scm: - integration-gerrit-scm: @@ -571,7 +391,7 @@ unstable-if: 0.0 pass-if: 100.0 - archive: - artifacts: '*karaf.log*' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[{project}]' @@ -593,6 +413,8 @@ project: 'integration/test' - integration-branch: branch: '{branch}' + - integration-distribution-stream: + stream: '{stream}' - integration-bundleurl: bundleurl: 'last' - integration-controller-scope: @@ -606,7 +428,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jre}' scm: - integration-gerrit-scm: @@ -651,7 +473,7 @@ unstable-if: 0.0 pass-if: 100.0 - archive: - artifacts: '*karaf.log*' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[{project}]' - plot: @@ -698,6 +520,8 @@ project: 'integration/test' - integration-branch: branch: '{branch}' + - integration-distribution-stream: + stream: '{stream}' - integration-bundleurl: bundleurl: 'last' - integration-controller-scope: @@ -711,7 +535,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jre}' scm: - integration-gerrit-scm: @@ -754,7 +578,7 @@ unstable-if: 0.0 pass-if: 100.0 - archive: - artifacts: '*karaf.log*' + artifacts: '*.log,*.log.xz' - email-notification: email-prefix: '[{project}]' - plot: