X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=f09f4e38e82b9e5594f282fe07724bfb602b0540;hb=1bbf59d7279dfa304aea28c30e3648802966f1bb;hp=0605320d42a08e9130da4cc81162e1c2e598b33b;hpb=4b526239b3edeb5e38ea0f71eee22c423c5ad434;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 0605320d4..f09f4e38e 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -27,41 +27,94 @@ # integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT) -# New templates +########### +# Anchors # +########### -- job-template: - name: '{prefix}{project}-csit-verify-1node-{functionality}' - id: inttest-csit-verify-1node - disabled: false +- inttest_csit_common: &inttest_csit_common + name: inttest-csit-common + # Defines common configuration to all CSIT jobs + + ##################### + # Default variables # + ##################### + + build-days-to-keep: 30 + build-timeout: 360 # Time in minutes + disable-job: false + + ##################### + # Job configuration # + ##################### project-type: freestyle node: centos7-robot-2c-8g + concurrent: true + disabled: '{disable-job}' properties: - opendaylight-infra-properties: build-days-to-keep: '{build-days-to-keep}' + wrappers: + - opendaylight-infra-wrappers: + build-timeout: '{build-timeout}' + +################# +# Job Templates # +################# + +- job-template: + name: '{prefix}{project}-csit-verify-1node-{functionality}' + id: inttest-csit-verify-1node + <<: *inttest_csit_common + + ##################### + # Default variables # + ##################### + + openstack-cloud: vex + openstack-heat-template: csit-2-instance-type.yaml + openstack-heat-template-dir: openstack-hot + + odl_system_flavor: 'odl-highcpu-4' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' + tools_system_count: '1' + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + + ##################### + # Job configuration # + ##################### + parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: only + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-2-type: + 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-distribution-branch: branch: '{verify-branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -74,18 +127,13 @@ 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' refspec: '$GERRIT_REFSPEC' branch: 'master' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - triggers: - integration-trigger-patch-submitted: gerrit-server-name: '{gerrit-server-name}' @@ -95,14 +143,10 @@ builders: - lf-infra-pre-build - - 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-stack-2-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -115,15 +159,15 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -138,44 +182,49 @@ # Default variables # ##################### - disable-job: false + openstack-cloud: vex + openstack-heat-template: csit-2-instance-type.yaml + openstack-heat-template-dir: openstack-hot + + odl_system_flavor: 'odl-highcpu-4' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' + tools_system_count: '1' + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + ##################### # Job configuration # ##################### - project-type: freestyle - node: centos7-robot-2c-8g - concurrent: true - disabled: '{disable-job}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-2-type: + 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-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -192,8 +241,6 @@ jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -206,20 +253,12 @@ - integration-csit-trigger: jobs: '{trigger-jobs}' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - builders: - lf-infra-pre-build - - 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-stack-2-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -232,9 +271,6 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' @@ -379,44 +415,55 @@ inclusion-flag: '{10-inclusion-flag}' exclude: '{10-exclude-value}' format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish - job-template: name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}' id: inttest-csit-1node + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_1node - job-template: name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}' id: inttest-csit-1node-custom + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_1node parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-2-type: + 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-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -433,43 +480,59 @@ jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' - job-template: name: '{prefix}{project}-csit-verify-3node-{functionality}' id: inttest-csit-verify-3node - disabled: false + <<: *inttest_csit_common - project-type: freestyle - node: centos7-robot-2c-8g + ##################### + # Default variables # + ##################### - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + openstack-cloud: vex + openstack-heat-template: csit-2-instance-type.yaml + openstack-heat-template-dir: openstack-hot + + odl_system_flavor: 'odl-highcpu-4' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' + tools_system_count: '1' + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + + ##################### + # Job Configuration # + ##################### parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: only + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: 'odl-jolokia,{install-features}' + use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-2-type: + 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}' - integration-distribution-branch: branch: '{verify-branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -484,8 +547,6 @@ jdkversion: '{verify-jdkversion}' - distribution-karaf-version: karaf-version: '{verify-karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -493,10 +554,6 @@ refspec: '$GERRIT_REFSPEC' branch: 'master' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - triggers: - integration-trigger-patch-submitted: gerrit-server-name: '{gerrit-server-name}' @@ -506,14 +563,10 @@ builders: - lf-infra-pre-build - - 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: '{tools_system_count}' - vm_1_flavor: '{tools_system_flavor}' - vm_1_image: '{tools_system_image}' + - integration-stack-2-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -527,15 +580,15 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -550,44 +603,48 @@ # Default variables # ##################### - disable-job: false + openstack-cloud: vex + openstack-heat-template: csit-2-instance-type.yaml + openstack-heat-template-dir: openstack-hot + + odl_system_flavor: 'odl-highcpu-4' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' + tools_system_count: '1' + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # Job configuration # ##################### - project-type: freestyle - node: centos7-robot-2c-8g - concurrent: true - disabled: '{disable-job}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: 'odl-jolokia,{install-features}' + use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-2-type: + 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}' - integration-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -604,8 +661,6 @@ jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -618,20 +673,12 @@ - integration-csit-trigger: jobs: '{trigger-jobs}' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - builders: - lf-infra-pre-build - - 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: '{tools_system_count}' - vm_1_flavor: '{tools_system_flavor}' - vm_1_image: '{tools_system_image}' + - integration-stack-2-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -645,9 +692,6 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' @@ -792,44 +836,55 @@ inclusion-flag: '{10-inclusion-flag}' exclude: '{10-exclude-value}' format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish - job-template: name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}' id: inttest-csit-3node + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_3node - job-template: name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}' id: inttest-csit-3node-custom + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_3node parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: 'odl-jolokia,{install-features}' + use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-2-type: + 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}' - integration-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -846,43 +901,60 @@ jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' - job-template: name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}' id: inttest-csit-3node-docker - disabled: false + <<: *inttest_csit_common - project-type: freestyle - node: centos7-robot-2c-8g + ##################### + # Default variables # + ##################### - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + openstack-cloud: vex + openstack-heat-template: csit-2-instance-type.yaml + openstack-heat-template-dir: openstack-hot + + odl_system_count: 1 + odl_system_flavor: 'odl-highcpu-4' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' + docker_system_count: '1' + docker_system_flavor: 'odl-standard-1' + docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840' + + ##################### + # Job Configuration # + ##################### parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: 'odl-jolokia,{install-features}' + use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-2-type: + 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-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -897,8 +969,6 @@ jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' - - integration-use-features-boot: - use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -906,20 +976,12 @@ refspec: '$PATCHREFSPEC' branch: 'master' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - builders: - lf-infra-pre-build - - 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-stack-2-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -933,9 +995,6 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' @@ -968,9 +1027,12 @@ inclusion-flag: 'off' display-table: true format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -985,42 +1047,61 @@ # Default variables # ##################### - disable-job: false + openstack-cloud: vex + openstack-heat-template: csit-4-instance-type.yaml + openstack-heat-template-dir: openstack-hot + + odl_system_count: 1 + odl_system_flavor: 'odl-highcpu-4' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' + openstack_system_count: 1 + openstack_system_flavor: 'odl-standard-4' + openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system2_count: 0 + openstack_system2_flavor: 'odl-standard-1' + openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + tools_system_count: 1 + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # Job configuration # ##################### - project-type: freestyle - node: centos7-robot-2c-8g - concurrent: true - disabled: '{disable-job}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-4-type: + 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: '{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-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -1035,8 +1116,6 @@ 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}' @@ -1060,8 +1139,9 @@ - string: name: ODL_ML2_PORT_BINDING default: '{odl-ml2-port-binding}' - description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or - network-topology)' + description: > + Method of networking-odl port-binding (pseudo-agentdb-binding or + legacy-port-binding or network-topology) - string: name: DEVSTACK_KUBERNETES_PLUGIN_REPO default: '{devstack-kubernetes-plugin-repo}' @@ -1137,8 +1217,9 @@ - string: name: LBAAS_SERVICE_PROVIDER default: '{lbaas-service-provider}' - description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using - neutron-lbaas' + 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}' @@ -1150,8 +1231,9 @@ - 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.' + 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: @@ -1159,29 +1241,15 @@ refspec: '$PATCHREFSPEC' branch: 'master' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - triggers: - timed: '{schedule}' builders: - lf-infra-pre-build - - 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: '{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-stack-4-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -1195,51 +1263,68 @@ - integration-cleanup-tmp publishers: - - integration-robot-tempest: - unstable-if: 0.0 - pass-if: 100.0 - 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 + - integration-csit-publish: + robot_other_files: + - tempest_results.html + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish - job-template: # 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 + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_hwvtep_openstack - job-template: # 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-custom + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_hwvtep_openstack parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-4-type: + 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: '{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-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -1254,8 +1339,6 @@ 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}' @@ -1384,42 +1467,61 @@ # Default variables # ##################### - disable-job: false + openstack-cloud: vex + openstack-heat-template: csit-4-instance-type.yaml + openstack-heat-template-dir: openstack-hot + + odl_system_count: 1 + odl_system_flavor: 'odl-highcpu-4' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' + openstack_system_count: 1 + openstack_system_flavor: 'odl-standard-4' + openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system2_count: 0 + openstack_system2_flavor: 'odl-standard-1' + openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + tools_system_count: 1 + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # Job configuration # ##################### - project-type: freestyle - node: centos7-robot-2c-8g - concurrent: true - disabled: '{disable-job}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-4-type: + 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: '{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-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -1434,8 +1536,6 @@ 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}' @@ -1562,29 +1662,15 @@ refspec: '$PATCHREFSPEC' branch: 'master' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - triggers: - timed: '{schedule}' builders: - lf-infra-pre-build - - 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: '{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-stack-4-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -1598,51 +1684,68 @@ - integration-cleanup-tmp publishers: - - integration-robot-tempest: - unstable-if: 0.0 - pass-if: 100.0 - 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 + - integration-csit-publish: + robot_other_files: + - tempest_results.html + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish - job-template: # 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 + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_openstack - job-template: # 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-custom + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_openstack parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-4-type: + 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: '{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-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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: '{project}.txt' - integration-config-plan: @@ -1657,8 +1760,6 @@ 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}' @@ -1787,15 +1888,9 @@ - job-template: name: '{prefix}{project}-patch-test-{feature}-{stream}' id: inttest-patch-test + <<: *inttest_csit_common - project-type: freestyle - node: centos7-builder-2c-8g - concurrent: true - jdk: '{java-version}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-timeout: 720 parameters: - opendaylight-infra-parameters: @@ -1825,10 +1920,6 @@ - integration-distribution-scm: branch: '{branch}' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - triggers: - gerrit: server-name: '{gerrit-server-name}' @@ -1852,6 +1943,8 @@ builders: - integration-rebase-gerrit-patch - wipe-org-opendaylight-repo + - lf-update-java-alternatives: + java-version: '{java-version}' - maven-target: maven-version: mvn35 pom: '{project}/pom.xml' @@ -1865,7 +1958,7 @@ {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' + - '-Xmx4096m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp global-settings: global-settings @@ -1881,7 +1974,7 @@ {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' + - '-Xmx1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp global-settings: global-settings @@ -1893,6 +1986,9 @@ block: true predefined-parameters: | BUNDLE_URL=$BUNDLE_URL + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_PROJECT=$GERRIT_PROJECT + GERRIT_REFSPEC=$GERRIT_REFSPEC KARAF_VERSION=$KARAF_VERSION publishers: @@ -1912,42 +2008,45 @@ # Default variables # ##################### - disable-job: false + openstack-cloud: vex + openstack-heat-template: csit-apex-3-instance-type.yaml + openstack-heat-template-dir: openstack-hot + controller-max-mem: '2048m' ##################### # Job configuration # ##################### - project-type: freestyle - node: centos7-robot-2c-8g - concurrent: true - disabled: '{disable-job}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-3-type: + vm_0_count: '{apex_controller_count}' + vm_0_flavor: '{apex_controller_flavor}' + vm_0_image: '{apex_controller_image}' + vm_1_count: '1' + vm_1_flavor: '{apex_compute_0_flavor}' + vm_1_image: '{apex_compute_0_image}' + vm_2_count: '1' + vm_2_flavor: '{apex_compute_1_flavor}' + vm_2_image: '{apex_compute_1_image}' - integration-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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-test-plan: test-plan: '{project}-{functionality}.txt' - integration-test-suites: @@ -1958,8 +2057,6 @@ 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}' @@ -1995,26 +2092,15 @@ refspec: '$PATCHREFSPEC' branch: 'master' - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - triggers: - timed: '{schedule}' builders: - lf-infra-pre-build - - integration-apex-stack-3-type: - stack-template: '{stack-template}' - vm_0_count: '{apex_controller_count}' - vm_0_flavor: '{apex_controller_flavor}' - vm_0_image: '{apex_controller_image}' - vm_1_count: '1' - vm_1_flavor: '{apex_compute_0_flavor}' - vm_1_image: '{apex_compute_0_image}' - vm_2_count: '1' - vm_2_flavor: '{apex_compute_1_flavor}' - vm_2_image: '{apex_compute_1_image}' + - integration-stack-3-type: + openstack-cloud: '{openstack-cloud}' + openstack-heat-template: '{openstack-heat-template}' + openstack-heat-template-dir: '{openstack-heat-template-dir}' - integration-install-robotframework - integration-detect-variables - integration-install-common-functions @@ -2027,50 +2113,64 @@ - integration-cleanup-tmp publishers: - - integration-robot-tempest: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: + - tempest_results.html + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish - job-template: # yamllint disable-line rule:line-length name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}' id: inttest-csit-apex + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_apex - job-template: # yamllint disable-line rule:line-length name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}' id: inttest-csit-apex-custom + <<: *inttest_csit_common + # yamllint disable-line rule:key-duplicates <<: *inttest_csit_apex parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: 'integration/test' + - integration-csit-parameters: + archive-artifacts: '{archive-artifacts}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + os-cloud: '{os-cloud}' + # CSIT + bundle-url: '{bundle-url}' + repo-url: '{repo-url}' + robot-options: '{robot-options}' + # Controller + controller-scope: '' + controller-max-mem: '{controller-max-mem}' + debug-map: '{debug-map}' + install-features: '{install-features}' + use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' + - integration-stack-3-type: + vm_0_count: '{apex_controller_count}' + vm_0_flavor: '{apex_controller_flavor}' + vm_0_image: '{apex_controller_image}' + vm_1_count: '1' + vm_1_flavor: '{apex_compute_0_flavor}' + vm_1_image: '{apex_compute_0_image}' + vm_2_count: '1' + vm_2_flavor: '{apex_compute_1_flavor}' + vm_2_image: '{apex_compute_1_image}' - integration-distribution-branch: branch: '{branch}' - integration-distribution-stream: 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-test-plan: test-plan: '{testplan}' - integration-test-suites: @@ -2081,8 +2181,6 @@ 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}'