X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=e68d44d1e325df48d8ecb29b6418f8cd49988be1;hb=1436f8f5f24783f9d3fae45f4344377f1a32cf68;hp=1ce162a0f2628a83785ff43a88583885b0528abd;hpb=4c80c4c6bdc68a7baf9576c2721915bffea4dd81;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 1ce162a0f..e68d44d1e 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -3,10 +3,8 @@ # FIXME: Update # # {project}-csit-1node-{functionality}-{install}-{stream} -# {project}-csit-1node-periodic-{functionality}-{install}-{stream} # {project}-csit-3node-docker-{functionality}-{install}-{stream} # {project}-csit-3node-{functionality}-{install}-{stream} -# {project}-csit-3node-periodic-{functionality}-{install}-{stream} # {project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream} # {project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream} # {project}-csit-verify-1node-{functionality} @@ -56,12 +54,18 @@ stream: '{verify-stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: controller-features: '{install-features}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: stream-test-plan: '{project}-{functionality}-{verify-stream}.txt' - integration-test-plan: @@ -118,13 +122,14 @@ email-prefix: '[{project}]' - integration-csit-archive-build - integration-csit-run-postscript + - releng-openstack-stack-delete - lf-infra-publish - job-template: name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}' id: inttest-csit-1node - # Keep synchronized with *-csit4-*-carbon please. - disabled: false + disable-job: false + disabled: '{disable-job}' project-type: freestyle node: centos7-robot-2c-8g @@ -146,16 +151,24 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: controller-features: '{install-features}' + - integration-controller-debug-map: + controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: - stream-test-plan: '{project}-{functionality}-{stream}.txt' + stream-test-plan: '{streamtestplan}' - integration-test-plan: - test-plan: '{project}-{functionality}.txt' + test-plan: '{testplan}' - integration-test-suites: test-suites: '{test-suites}' - integration-patch-refspec: @@ -202,122 +215,6 @@ - integration-deploy-controller-run-test - integration-cleanup-tmp - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[{project}]' - - plot: - - title: '{01-plot-title}' - yaxis: '{01-plot-yaxis}' - group: '{01-plot-group}' - num-builds: '5400' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' - 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' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' - series: - - file: '{02-plot-data-file}' - inclusion-flag: 'off' - display-table: true - format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - lf-infra-publish - -- job-template: - name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - id: inttest-csit-1node-periodic - disabled: false - - project-type: freestyle - node: centos7-robot-2c-8g - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-distribution-branch: - branch: '{branch}' - - integration-distribution-stream: - stream: '{stream}' - - integration-bundle-url: - bundle-url: '{bundle-url}' - - integration-controller-scope: - controller-scope: '{scope}' - - integration-controller-features: - controller-features: '{install-features}' - - integration-test-options: - test-options: '{robot-options}' - - integration-stream-test-plan: - stream-test-plan: '{project}-{functionality}-{stream}.txt' - - integration-test-plan: - test-plan: '{project}-{functionality}.txt' - - integration-test-suites: - test-suites: '{test-suites}' - - integration-patch-refspec: - branch: 'master' - - integration-jdk-version: - jdkversion: '{jre}' - - distribution-karaf-version: - karaf-version: '{karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' - - scm: - - integration-gerrit-scm: - basedir: 'test' - refspec: '$PATCHREFSPEC' - branch: 'master' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - builders: - - integration-infra-stack: - stack-template: '{stack-template}' - vm_0_count: '1' - vm_0_flavor: '{odl_system_flavor}' - vm_0_image: '{odl_system_image}' - vm_1_count: '{tools_system_count}' - vm_1_flavor: '{tools_system_flavor}' - vm_1_image: '{tools_system_image}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-get-slave-addresses - - inject: - properties-file: 'slave_addresses.txt' - - integration-detect-variables - - integration-install-common-functions - - integration-deploy-controller-run-test - - integration-cleanup-tmp - publishers: - integration-robot: unstable-if: 0.0 @@ -334,7 +231,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' series: - file: '{01-plot-data-file}' inclusion-flag: 'off' @@ -348,7 +245,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' series: - file: '{02-plot-data-file}' inclusion-flag: 'off' @@ -362,7 +259,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv' series: - file: '{03-plot-data-file}' inclusion-flag: '{03-inclusion-flag}' @@ -376,7 +273,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv' series: - file: '{04-plot-data-file}' inclusion-flag: '{04-inclusion-flag}' @@ -390,7 +287,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv' series: - file: '{05-plot-data-file}' inclusion-flag: '{05-inclusion-flag}' @@ -404,7 +301,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv' series: - file: '{06-plot-data-file}' inclusion-flag: '{06-inclusion-flag}' @@ -418,7 +315,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv' series: - file: '{07-plot-data-file}' inclusion-flag: '{07-inclusion-flag}' @@ -432,7 +329,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv' series: - file: '{08-plot-data-file}' inclusion-flag: '{08-inclusion-flag}' @@ -446,7 +343,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv' series: - file: '{09-plot-data-file}' inclusion-flag: '{09-inclusion-flag}' @@ -460,7 +357,7 @@ style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv' + csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv' series: - file: '{10-plot-data-file}' inclusion-flag: '{10-inclusion-flag}' @@ -468,6 +365,7 @@ format: csv - integration-csit-archive-build - integration-csit-run-postscript + - releng-openstack-stack-delete - lf-infra-publish - job-template: @@ -495,12 +393,18 @@ stream: '{verify-stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: controller-features: 'odl-jolokia,{install-features}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: stream-test-plan: '{project}-{functionality}-{verify-stream}.txt' - integration-test-plan: @@ -561,6 +465,7 @@ email-prefix: '[{project}]' - integration-csit-archive-build - integration-csit-run-postscript + - releng-openstack-stack-delete - lf-infra-publish - job-template: @@ -588,16 +493,24 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: controller-features: 'odl-jolokia,{install-features}' + - integration-controller-debug-map: + controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: - stream-test-plan: '{project}-{functionality}-{stream}.txt' + stream-test-plan: '{streamtestplan}' - integration-test-plan: - test-plan: '{project}-{functionality}.txt' + test-plan: '{testplan}' - integration-test-suites: test-suites: '{test-suites}' - integration-patch-refspec: @@ -651,10 +564,11 @@ - title: '{01-plot-title}' yaxis: '{01-plot-yaxis}' group: '{01-plot-group}' - num-builds: '5400' + num-builds: '180' keep-records: true style: line use-description: false + # yamllint disable-line rule:line-length csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' series: - file: '{01-plot-data-file}' @@ -664,138 +578,137 @@ - title: '{02-plot-title}' yaxis: '{02-plot-yaxis}' group: '{02-plot-group}' - num-builds: '5400' + num-builds: '180' keep-records: true style: line use-description: false + # yamllint disable-line rule:line-length csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' series: - file: '{02-plot-data-file}' inclusion-flag: 'off' display-table: true format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - lf-infra-publish - -- job-template: - name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}' - id: inttest-csit-3node-docker - disabled: false - - project-type: freestyle - node: centos7-robot-2c-8g - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-distribution-branch: - branch: '{branch}' - - integration-distribution-stream: - stream: '{stream}' - - integration-bundle-url: - bundle-url: '{bundle-url}' - - integration-controller-scope: - controller-scope: '{scope}' - - integration-controller-features: - controller-features: 'odl-jolokia,{install-features}' - - integration-test-options: - test-options: '{robot-options}' - - integration-stream-test-plan: - stream-test-plan: '{project}-{functionality}-{stream}.txt' - - integration-test-plan: - test-plan: '{project}-{functionality}.txt' - - integration-patch-refspec: - branch: 'master' - - integration-jdk-version: - jdkversion: '{jre}' - - distribution-karaf-version: - karaf-version: '{karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' - - scm: - - integration-gerrit-scm: - basedir: 'test' - refspec: '$PATCHREFSPEC' - branch: 'master' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - builders: - - integration-infra-stack: - stack-template: '{stack-template}' - vm_0_count: '3' - vm_0_flavor: '{odl_system_flavor}' - vm_0_image: '{odl_system_image}' - vm_1_count: '{docker_system_count}' - vm_1_flavor: '{docker_system_flavor}' - vm_1_image: '{docker_system_image}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-get-slave-addresses - - inject: - properties-file: 'slave_addresses.txt' - - integration-detect-variables - - integration-install-common-functions - - integration-configure-clustering - - integration-start-cluster-run-test - - integration-cleanup-tmp - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[{project}]' - - plot: - - title: '{01-plot-title}' - yaxis: '{01-plot-yaxis}' - group: '{01-plot-group}' - num-builds: '5400' + - title: '{03-plot-title}' + yaxis: '{03-plot-yaxis}' + group: '{03-plot-group}' + num-builds: '180' keep-records: true style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv' series: - - file: '{01-plot-data-file}' - inclusion-flag: 'off' - display-table: true + - file: '{03-plot-data-file}' + inclusion-flag: '{03-inclusion-flag}' + exclude: '{03-exclude-value}' format: csv - - title: '{02-plot-title}' - yaxis: '{02-plot-yaxis}' - group: '{02-plot-group}' - num-builds: '5400' + - title: '{04-plot-title}' + yaxis: '{04-plot-yaxis}' + group: '{04-plot-group}' + num-builds: '180' keep-records: true style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv' series: - - file: '{02-plot-data-file}' - inclusion-flag: 'off' - display-table: true + - file: '{04-plot-data-file}' + inclusion-flag: '{04-inclusion-flag}' + exclude: '{04-exclude-value}' + format: csv + - title: '{05-plot-title}' + yaxis: '{05-plot-yaxis}' + group: '{05-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + # yamllint disable-line rule:line-length + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv' + series: + - file: '{05-plot-data-file}' + inclusion-flag: '{05-inclusion-flag}' + exclude: '{05-exclude-value}' + format: csv + - title: '{06-plot-title}' + yaxis: '{06-plot-yaxis}' + group: '{06-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + # yamllint disable-line rule:line-length + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv' + series: + - file: '{06-plot-data-file}' + inclusion-flag: '{06-inclusion-flag}' + exclude: '{06-exclude-value}' + format: csv + - title: '{07-plot-title}' + yaxis: '{07-plot-yaxis}' + group: '{07-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + # yamllint disable-line rule:line-length + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv' + series: + - file: '{07-plot-data-file}' + inclusion-flag: '{07-inclusion-flag}' + exclude: '{07-exclude-value}' + format: csv + - title: '{08-plot-title}' + yaxis: '{08-plot-yaxis}' + group: '{08-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + # yamllint disable-line rule:line-length + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv' + series: + - file: '{08-plot-data-file}' + inclusion-flag: '{08-inclusion-flag}' + exclude: '{08-exclude-value}' + format: csv + - title: '{09-plot-title}' + yaxis: '{09-plot-yaxis}' + group: '{09-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + # yamllint disable-line rule:line-length + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv' + series: + - file: '{09-plot-data-file}' + inclusion-flag: '{09-inclusion-flag}' + exclude: '{09-exclude-value}' + format: csv + - title: '{10-plot-title}' + yaxis: '{10-plot-yaxis}' + group: '{10-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + # yamllint disable-line rule:line-length + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv' + series: + - file: '{10-plot-data-file}' + inclusion-flag: '{10-inclusion-flag}' + exclude: '{10-exclude-value}' format: csv - integration-csit-archive-build - integration-csit-run-postscript + - releng-openstack-stack-delete - lf-infra-publish - job-template: - name: '{prefix}{project}-csit-3node-periodic-{functionality}-{install}-{stream}' - id: inttest-csit-3node-periodic + name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}' + id: inttest-csit-3node-docker disabled: false project-type: freestyle @@ -818,18 +731,22 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: controller-features: 'odl-jolokia,{install-features}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: stream-test-plan: '{project}-{functionality}-{stream}.txt' - integration-test-plan: test-plan: '{project}-{functionality}.txt' - - integration-test-suites: - test-suites: '{test-suites}' - integration-patch-refspec: branch: 'master' - integration-jdk-version: @@ -855,9 +772,9 @@ vm_0_count: '3' vm_0_flavor: '{odl_system_flavor}' vm_0_image: '{odl_system_image}' - vm_1_count: '{tools_system_count}' - vm_1_flavor: '{tools_system_flavor}' - vm_1_image: '{tools_system_image}' + vm_1_count: '{docker_system_count}' + vm_1_flavor: '{docker_system_flavor}' + vm_1_image: '{docker_system_image}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -881,12 +798,12 @@ - title: '{01-plot-title}' yaxis: '{01-plot-yaxis}' group: '{01-plot-group}' - num-builds: '180' + num-builds: '5400' keep-records: true style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv' series: - file: '{01-plot-data-file}' inclusion-flag: 'off' @@ -895,135 +812,25 @@ - title: '{02-plot-title}' yaxis: '{02-plot-yaxis}' group: '{02-plot-group}' - num-builds: '180' + num-builds: '5400' keep-records: true style: line use-description: false # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' + csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv' series: - file: '{02-plot-data-file}' inclusion-flag: 'off' display-table: true format: csv - - title: '{03-plot-title}' - yaxis: '{03-plot-yaxis}' - group: '{03-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv' - series: - - file: '{03-plot-data-file}' - inclusion-flag: '{03-inclusion-flag}' - exclude: '{03-exclude-value}' - format: csv - - title: '{04-plot-title}' - yaxis: '{04-plot-yaxis}' - group: '{04-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv' - series: - - file: '{04-plot-data-file}' - inclusion-flag: '{04-inclusion-flag}' - exclude: '{04-exclude-value}' - format: csv - - title: '{05-plot-title}' - yaxis: '{05-plot-yaxis}' - group: '{05-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv' - series: - - file: '{05-plot-data-file}' - inclusion-flag: '{05-inclusion-flag}' - exclude: '{05-exclude-value}' - format: csv - - title: '{06-plot-title}' - yaxis: '{06-plot-yaxis}' - group: '{06-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv' - series: - - file: '{06-plot-data-file}' - inclusion-flag: '{06-inclusion-flag}' - exclude: '{06-exclude-value}' - format: csv - - title: '{07-plot-title}' - yaxis: '{07-plot-yaxis}' - group: '{07-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv' - series: - - file: '{07-plot-data-file}' - inclusion-flag: '{07-inclusion-flag}' - exclude: '{07-exclude-value}' - format: csv - - title: '{08-plot-title}' - yaxis: '{08-plot-yaxis}' - group: '{08-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv' - series: - - file: '{08-plot-data-file}' - inclusion-flag: '{08-inclusion-flag}' - exclude: '{08-exclude-value}' - format: csv - - title: '{09-plot-title}' - yaxis: '{09-plot-yaxis}' - group: '{09-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv' - series: - - file: '{09-plot-data-file}' - inclusion-flag: '{09-inclusion-flag}' - exclude: '{09-exclude-value}' - format: csv - - title: '{10-plot-title}' - yaxis: '{10-plot-yaxis}' - group: '{10-plot-group}' - num-builds: '180' - keep-records: true - style: line - use-description: false - # yamllint disable-line rule:line-length - csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv' - series: - - file: '{10-plot-data-file}' - inclusion-flag: '{10-inclusion-flag}' - exclude: '{10-exclude-value}' - format: csv - integration-csit-archive-build - integration-csit-run-postscript + - releng-openstack-stack-delete - lf-infra-publish - job-template: - name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + # yamllint disable-line rule:line-length + name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}' id: inttest-csit-hwvtep-openstack disabled: false @@ -1048,12 +855,18 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-features: controller-features: '{install-features}' - integration-controller-debug-map: controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-test-plan: test-plan: '{testplan}' - integration-test-suites: @@ -1103,10 +916,6 @@ name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO default: '{devstack-networking-sfc-plugin-repo}' description: 'URL to fetch neutron-lbaas devstack plugin' - - string: - name: ODL_ENABLE_L3_FWD - default: '{odl-enable-l3}' - description: 'Enable L3 FWD in ODL for createing br-ex' - string: name: IPSEC_VXLAN_TUNNELS_ENABLED default: '{ipsec-vxlan-tunnels-enabled}' @@ -1147,6 +956,10 @@ name: SECURITY_GROUP_MODE default: '{security-group-mode}' description: 'Security Group Mode to be used in netvirt aclservice config' + - string: + name: ENABLE_ITM_DIRECT_TUNNELS + default: '{enable-itm-direct-tunnels}' + description: 'Tunnel Configuration mode to be used in genius ifm config' - string: name: PUBLIC_PHYSICAL_NETWORK default: '{public-physical-network}' @@ -1176,6 +989,11 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' + - string: + name: OVS_INSTALL + default: '{ovs-install}' + description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum + repo url to pull from.' scm: - integration-gerrit-scm: basedir: 'test' @@ -1223,12 +1041,15 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' + - integration-csit-collect-netvirt-logs - integration-csit-archive-build - integration-csit-run-postscript + - releng-openstack-stack-delete - lf-infra-publish - job-template: - name: '{prefix}{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' + # yamllint disable-line rule:line-length + name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}' id: inttest-csit-openstack disabled: false @@ -1253,12 +1074,18 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-features: controller-features: '{install-features}' - integration-controller-debug-map: controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-test-plan: test-plan: '{testplan}' - integration-test-suites: @@ -1296,6 +1123,10 @@ default: '{odl-ml2-port-binding}' description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or network-topology)' + - string: + name: ENABLE_GRE_TYPE_DRIVERS + default: '{enable-gre-type-driver}' + description: 'Enable gre tunnel' - string: name: DEVSTACK_KUBERNETES_PLUGIN_REPO default: '{devstack-kubernetes-plugin-repo}' @@ -1308,10 +1139,6 @@ name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO default: '{devstack-networking-sfc-plugin-repo}' description: 'URL to fetch neutron-lbaas devstack plugin' - - string: - name: ODL_ENABLE_L3_FWD - default: '{odl-enable-l3}' - description: 'Enable L3 FWD in ODL for createing br-ex' - string: name: IPSEC_VXLAN_TUNNELS_ENABLED default: '{ipsec-vxlan-tunnels-enabled}' @@ -1352,6 +1179,10 @@ name: SECURITY_GROUP_MODE default: '{security-group-mode}' description: 'Security Group Mode to be used in netvirt aclservice config' + - string: + name: ENABLE_ITM_DIRECT_TUNNELS + default: '{enable-itm-direct-tunnels}' + description: 'Tunnel Configuration mode to be used in genius ifm config' - string: name: PUBLIC_PHYSICAL_NETWORK default: '{public-physical-network}' @@ -1373,10 +1204,6 @@ default: '{lbaas-service-provider}' description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using neutron-lbaas' - - string: - name: NUM_OPENSTACK_SITES - default: '{num-openstack-sites}' - description: 'Number of openstack sites' - string: name: ODL_SFC_DRIVER default: '{odl-sfc-driver}' @@ -1385,7 +1212,11 @@ name: ODL_SNAT_MODE default: '{odl-snat-mode}' description: 'The SNAT mode to be configured - options are conntrack/controller.' - + - string: + name: OVS_INSTALL + default: '{ovs-install}' + description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum + repo url to pull from.' scm: - integration-gerrit-scm: basedir: 'test' @@ -1430,8 +1261,10 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' + - integration-csit-collect-netvirt-logs - integration-csit-archive-build - integration-csit-run-postscript + - releng-openstack-stack-delete - lf-infra-publish # Template: {project}-patch-test-{stream} @@ -1470,7 +1303,7 @@ default: 'all' description: 'Specific feature test for patch' - maven-exec: - maven-version: mvn33 + maven-version: mvn35 scm: - integration-gerrit-scm: @@ -1508,12 +1341,13 @@ - integration-rebase-gerrit-patch - wipe-org-opendaylight-repo - maven-target: - maven-version: mvn33 + maven-version: mvn35 pom: '{project}/pom.xml' goals: | clean install dependency:tree -Pq -Dgitid.skip=false + -Dmaven.gitcommitid.skip=false -DgenerateReports=false -Dstream={stream} {opendaylight-infra-mvn-opts} @@ -1525,12 +1359,13 @@ global-settings: global-settings global-settings-type: cfp - maven-target: - maven-version: mvn33 + maven-version: mvn35 pom: distribution/pom.xml goals: | clean install dependency:tree -Pq -Dgitid.skip=false + -Dmaven.gitcommitid.skip=false {opendaylight-infra-mvn-opts} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: