X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=bfac98942786bca9329225d2009409d7ecc1184d;hb=6aad4a9bd5ef29209ec9760ec736724a8b88bdda;hp=6a54a6713e0400546c819903438ede3d6f4970ea;hpb=49efb6213e9c677f9ef74be0fcf41443757d13cb;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 6a54a6713..bfac98942 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -69,6 +69,24 @@ 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 - 20190924-232354.381' + tools_system_count: 1 + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' + + ##################### + # Job configuration # + ##################### + parameters: - integration-csit-parameters: archive-artifacts: '{archive-artifacts}' @@ -83,6 +101,14 @@ 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: @@ -115,14 +141,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' @@ -142,6 +164,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -156,7 +180,16 @@ # Default variables # ##################### - # TODO: Add default variables here. + 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 - 20190924-232354.381' + tools_system_count: 1 + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' + ##################### # Job configuration # @@ -176,6 +209,14 @@ 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: @@ -210,14 +251,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' @@ -378,6 +415,8 @@ 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: @@ -408,6 +447,14 @@ 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: @@ -439,7 +486,15 @@ # Default variables # ##################### - # TODO: Add default variables here + 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 - 20190924-232354.381' + tools_system_count: 1 + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' ##################### # Job Configuration # @@ -459,6 +514,14 @@ 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: @@ -493,14 +556,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' @@ -521,6 +580,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -535,7 +596,15 @@ # Default variables # ##################### - # TODO: Add default variables here + 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 - 20190924-232354.381' + tools_system_count: 1 + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' ##################### # Job configuration # @@ -555,6 +624,14 @@ 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: @@ -589,14 +666,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' @@ -758,6 +831,8 @@ 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: @@ -788,6 +863,14 @@ 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: @@ -819,7 +902,16 @@ # Default variables # ##################### - # TODO: Add default variables here + 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 - 20190924-232354.381' + docker_system_count: 1 + docker_system_flavor: 'odl-standard-1' + docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840' ##################### # Job Configuration # @@ -839,6 +931,14 @@ 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: @@ -866,14 +966,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: '{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' @@ -923,6 +1019,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -937,7 +1035,22 @@ # Default variables # ##################### - # TODO: Add default variables here + 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 - 20190924-232354.381' + 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-25 - 20190416-121328.240' ##################### # Job configuration # @@ -957,6 +1070,20 @@ 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: @@ -1102,20 +1229,10 @@ 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' @@ -1138,6 +1255,8 @@ - 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: @@ -1170,6 +1289,20 @@ 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: @@ -1316,7 +1449,22 @@ # Default variables # ##################### - # TODO: Add default variables here + 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 - 20190924-232354.381' + 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-25 - 20190416-121328.240' ##################### # Job configuration # @@ -1336,6 +1484,20 @@ 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: @@ -1485,20 +1647,10 @@ 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' @@ -1521,6 +1673,8 @@ - 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: @@ -1553,6 +1707,20 @@ 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: @@ -1754,6 +1922,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' @@ -1767,7 +1937,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 @@ -1783,7 +1953,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 @@ -1817,7 +1987,9 @@ # Default variables # ##################### - # TODO: Add default variables here + openstack-cloud: vex + openstack-heat-template: csit-apex-3-instance-type.yaml + openstack-heat-template-dir: openstack-hot ##################### # Job configuration # @@ -1837,6 +2009,17 @@ 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: @@ -1891,17 +2074,10 @@ 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 @@ -1922,6 +2098,8 @@ - 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: @@ -1954,6 +2132,17 @@ 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: