X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=7bc5e1e0068c416e661a3053f09c637c71bb18f4;hb=3fabb06fd0e62b6175634002f8f5d841e11d8550;hp=187dd76cbfa93cbae4a8226d3cfdf755cfdc325d;hpb=f773b83553de441a25e474907afe5647e379c847;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 187dd76cb..7bc5e1e00 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -2,12 +2,14 @@ # Job templates in this file (please update with every new template): # FIXME: Update # -# {project}-csit-verify-1node-{functionality} # {project}-csit-1node-{functionality}-{install}-{stream} -# {project}-csit-1node-periodic-{functionality}-{install}-{stream} -# {project}-csit-verify-3node-{functionality} +# {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} +# {project}-csit-verify-3node-{functionality} +# {project}-patch-test-{feature}-{stream} # # Parameters: # FIXME: Distinguish variables, macros and arguments, then update. @@ -15,23 +17,25 @@ # opendaylight-infra-parameters: main project integration/test ($PROJECT) # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL # integration-distribution-branch: distribution branch ($DISTROBRANCH) -# integration-controller-bundleurl: distribution URL ($BUNDLEURL) +# integration-controller-bundle-url: distribution URL ($BUNDLE_URL) # integration-controller-scope: only or all features ($CONTROLLERSCOPE) # integration-controller-features: features under test ($CONTROLLER FEATURES) # integration-test-options: robot options ($TESTOPTIONS) # integration-stream-test-plan: stream specific robot test plan ($STREAMTESTPLAN) # integration-test-plan: fallback robot test plan ($TESTPLAN) # integration-patch-refspec: test branch ($PATCHREFSPEC) +# integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT) # New templates - job-template: - name: '{project}-csit-verify-1node-{functionality}' + name: '{prefix}{project}-csit-verify-1node-{functionality}' + id: inttest-csit-verify-1node disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -48,8 +52,10 @@ branch: '{verify-branch}' - integration-distribution-stream: stream: '{verify-stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: @@ -62,7 +68,10 @@ test-plan: '{project}-{functionality}.txt' - integration-jdk-version: jdkversion: '{verify-jdkversion}' - + - distribution-karaf-version: + karaf-version: '{verify-karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: basedir: 'test' @@ -75,7 +84,7 @@ triggers: - integration-trigger-patch-submitted: - server: '{server-name}' + gerrit-server-name: '{gerrit-server-name}' project: 'integration/test' branch: 'master' files: 'csit/suites/{project}/**' @@ -95,9 +104,8 @@ - integration-get-slave-addresses - inject: properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' + - integration-detect-variables + - integration-install-common-functions - integration-deploy-controller-run-test - integration-cleanup-tmp @@ -109,15 +117,18 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish - job-template: - name: '{project}-csit-1node-{functionality}-{install}-{stream}' + name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}' + id: inttest-csit-1node + # Keep synchronized with *-csit4-*-carbon please. disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -134,22 +145,32 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - 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-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: @@ -157,115 +178,10 @@ 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-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 - - 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 - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' - -- job-template: - name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - disabled: false - - project-type: freestyle - node: centos7-robot-2c-2g - - 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-bundleurl: - bundleurl: '{bundleurl}' - - 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-patch-refspec: - branch: 'master' - - integration-jdk-version: - jdkversion: '{jre}' - - scm: - - integration-gerrit-scm: - basedir: 'test' - refspec: '$PATCHREFSPEC' - branch: 'master' + triggers: + # we need this for not SR projects + - integration-csit-trigger: + jobs: '{trigger-jobs}' wrappers: - opendaylight-infra-wrappers: @@ -286,9 +202,8 @@ - integration-get-slave-addresses - inject: properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' + - integration-detect-variables + - integration-install-common-functions - integration-deploy-controller-run-test - integration-cleanup-tmp @@ -308,7 +223,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' @@ -322,7 +237,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' @@ -336,7 +251,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}' @@ -350,7 +265,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}' @@ -364,7 +279,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}' @@ -378,7 +293,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}' @@ -392,7 +307,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}' @@ -406,7 +321,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}' @@ -420,7 +335,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}' @@ -434,22 +349,24 @@ 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}' exclude: '{10-exclude-value}' format: csv - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish - job-template: - name: '{project}-csit-verify-3node-{functionality}' + name: '{prefix}{project}-csit-verify-3node-{functionality}' + id: inttest-csit-verify-3node disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -466,8 +383,10 @@ branch: '{verify-branch}' - integration-distribution-stream: stream: '{verify-stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: @@ -478,8 +397,14 @@ stream-test-plan: '{project}-{functionality}-{verify-stream}.txt' - integration-test-plan: test-plan: '{project}-{functionality}.txt' + - integration-test-suites: + test-suites: '{test-suites}' - integration-jdk-version: jdkversion: '{verify-jdkversion}' + - distribution-karaf-version: + karaf-version: '{verify-karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -493,7 +418,7 @@ triggers: - integration-trigger-patch-submitted: - server: '{server-name}' + gerrit-server-name: '{gerrit-server-name}' project: 'integration/test' branch: 'master' files: 'csit/suites/{project}/**' @@ -513,9 +438,8 @@ - integration-get-slave-addresses - inject: properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' + - integration-detect-variables + - integration-install-common-functions - integration-configure-clustering - integration-start-cluster-run-test - integration-cleanup-tmp @@ -528,15 +452,17 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish - job-template: - name: '{project}-csit-3node-{functionality}-{install}-{stream}' + name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}' + id: inttest-csit-3node disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -553,22 +479,32 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - 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-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: @@ -595,9 +531,8 @@ - integration-get-slave-addresses - inject: properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' + - integration-detect-variables + - integration-install-common-functions - integration-configure-clustering - integration-start-cluster-run-test - integration-cleanup-tmp @@ -613,10 +548,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}' @@ -626,137 +562,141 @@ - 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 - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' - -- job-template: - name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}' - disabled: false - - project-type: freestyle - node: centos7-robot-2c-2g - - 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-bundleurl: - bundleurl: '{bundleurl}' - - 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}' - - 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-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' - - 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 - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish - job-template: - name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' + name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}' + id: inttest-csit-3node-docker disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -773,8 +713,10 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -789,6 +731,10 @@ 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: @@ -806,18 +752,17 @@ 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' - integration-get-slave-addresses - inject: properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' + - integration-detect-variables + - integration-install-common-functions - integration-configure-clustering - integration-start-cluster-run-test - integration-cleanup-tmp @@ -833,12 +778,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' @@ -847,139 +792,29 @@ - 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 - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish - job-template: - name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + id: inttest-csit-hwvtep-openstack disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g concurrent: true properties: @@ -997,22 +832,36 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - 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-test-plan: test-plan: '{testplan}' + - 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: '{use-features-boot}' - string: name: OPENSTACK_BRANCH default: '{openstack-branch}' description: 'Openstack version to use with devstack' + - string: + name: DEVSTACK_HASH + default: '{devstack-hash}' + description: 'devstack hash to checkout' - string: name: ODL_ML2_DRIVER_REPO default: '{odl-ml2-driver-repo}' @@ -1061,7 +910,15 @@ - string: name: ENABLE_OS_SERVICES default: '{enable-openstack-services}' - description: 'comma seperated list of services to enable' + description: 'comma separated list of services to enable on controller nodes' + - string: + name: ENABLE_OS_COMPUTE_SERVICES + default: '{enable-openstack-compute-services}' + description: 'comma separated list of services to enable on compute nodes' + - string: + name: ENABLE_OS_NETWORK_SERVICES + default: '{enable-openstack-network-services}' + description: 'comma seperated list of network services to enable' - string: name: ENABLE_OS_PLUGINS default: '{enable-openstack-plugins}' @@ -1099,6 +956,14 @@ 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: ODL_SFC_DRIVER + default: '{odl-sfc-driver}' + description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc' + - string: + name: ODL_SNAT_MODE + default: '{odl-snat-mode}' + description: 'The SNAT mode to be configured - options are conntrack/controller.' scm: - integration-gerrit-scm: basedir: 'test' @@ -1113,25 +978,28 @@ - timed: '{schedule}' builders: - - integration-infra-stack-3-type: + - integration-infra-stack-4-type: + stack-template: '{stack-template}' vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' vm_0_image: '{odl_system_image}' vm_1_count: '{openstack_system_count}' vm_1_flavor: '{openstack_system_flavor}' vm_1_image: '{openstack_system_image}' - vm_2_count: '{tools_system_count}' - vm_2_flavor: '{tools_system_flavor}' - vm_2_image: '{tools_system_image}' + vm_2_count: '{openstack_system2_count}' + vm_2_flavor: '{openstack_system2_flavor}' + vm_2_image: '{openstack_system2_image}' + vm_3_count: '{tools_system_count}' + vm_3_flavor: '{tools_system_flavor}' + vm_3_image: '{tools_system_image}' - 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-detect-variables + - integration-install-common-functions - integration-deploy-controller-run-test - integration-deploy-openstack-run-test - integration-cleanup-tmp @@ -1144,15 +1012,17 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish - job-template: - name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' + name: '{prefix}{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' + id: inttest-csit-openstack disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g concurrent: true properties: @@ -1170,22 +1040,36 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - 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-test-plan: test-plan: '{testplan}' + - 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: '{use-features-boot}' - string: name: OPENSTACK_BRANCH default: '{openstack-branch}' description: 'Openstack version to use with devstack' + - string: + name: DEVSTACK_HASH + default: '{devstack-hash}' + description: 'devstack hash to checkout' - string: name: ODL_ML2_DRIVER_REPO default: '{odl-ml2-driver-repo}' @@ -1235,6 +1119,14 @@ name: ENABLE_OS_SERVICES default: '{enable-openstack-services}' description: 'comma seperated list of services to enable' + - string: + name: ENABLE_OS_COMPUTE_SERVICES + default: '{enable-openstack-compute-services}' + description: 'comma separated list of services to enable on compute nodes' + - string: + name: ENABLE_OS_NETWORK_SERVICES + default: '{enable-openstack-network-services}' + description: 'comma seperated list of network services to enable' - string: name: ENABLE_OS_PLUGINS default: '{enable-openstack-plugins}' @@ -1276,6 +1168,14 @@ name: NUM_OPENSTACK_SITES default: '{num-openstack-sites}' description: 'Number of openstack sites' + - string: + name: ODL_SFC_DRIVER + default: '{odl-sfc-driver}' + description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc' + - string: + name: ODL_SNAT_MODE + default: '{odl-snat-mode}' + description: 'The SNAT mode to be configured - options are conntrack/controller.' scm: - integration-gerrit-scm: @@ -1291,7 +1191,7 @@ - timed: '{schedule}' builders: - - integration-infra-stack: + - integration-infra-stack-3-type: stack-template: '{stack-template}' vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' @@ -1299,15 +1199,17 @@ vm_1_count: '{openstack_system_count}' vm_1_flavor: '{openstack_system_flavor}' vm_1_image: '{openstack_system_image}' + vm_2_count: '{openstack_system2_count}' + vm_2_flavor: '{openstack_system2_flavor}' + vm_2_image: '{openstack_system2_image}' - 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-detect-variables + - integration-install-common-functions - integration-deploy-controller-run-test - integration-deploy-openstack-run-test - integration-cleanup-tmp @@ -1320,8 +1222,9 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish # Template: {project}-patch-test-{stream} # Goal: Build a patch and run project specific system test on a distribution containing the change @@ -1329,12 +1232,13 @@ # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword - job-template: - name: '{project}-patch-test-{feature}-{stream}' + name: '{prefix}{project}-patch-test-{feature}-{stream}' + id: inttest-patch-test project-type: freestyle - node: centos7-java-builder-2c-8g + node: centos7-builder-2c-8g concurrent: true - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: @@ -1349,6 +1253,8 @@ artifacts: '{archive-artifacts}' - integration-distribution-branch: branch: '{branch}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - integration-distribution-git-url: git-url: '{git-url}' - string: @@ -1356,7 +1262,7 @@ default: 'all' description: 'Specific feature test for patch' - maven-exec: - maven-version: mvn33 + maven-version: mvn35 scm: - integration-gerrit-scm: @@ -1372,7 +1278,7 @@ triggers: - gerrit: - server-name: '{server-name}' + server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: comment-contains-value: 'test-{project}-all' @@ -1394,42 +1300,47 @@ - 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} + # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + 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: - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - - distribution-check-deploy-distribution: + - integration-upload-distribution: dist-pom: distribution/pom.xml - trigger-builds: - project: '{csit-list}' block: true - predefined-parameters: - BUNDLEURL=$BUNDLE_URL + predefined-parameters: | + BUNDLE_URL=$BUNDLE_URL + KARAF_VERSION=$KARAF_VERSION publishers: - email-notification: