From: Vladimir Khlyunev Date: Wed, 31 Jul 2019 10:22:50 +0000 (+0400) Subject: Use hdd_ext flavors with extended volume for tests X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=273d1323607695a01bc97bfbdb857386be92c445;p=tools%2Fsustaining.git Use hdd_ext flavors with extended volume for tests Change-Id: Icaff9938ecd4361447a3790375b2887da1edd35b --- diff --git a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml index 9eb542d..60dc380 100644 --- a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml +++ b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml @@ -25,7 +25,7 @@ builders: - conditional-step: condition-kind: num-comp - lhs: $CUSTOM_FLAVOR_NODE_COUNT + lhs: $MOS_HUGE_HDD_EXT_NODE_COUNT rhs: 0 comparator: greater-than steps: @@ -35,19 +35,19 @@ parameter-factories: - factory: counterbuild from: 1 - to: $CUSTOM_FLAVOR_NODE_COUNT + to: $MOS_HUGE_HDD_EXT_NODE_COUNT step: 1 predefined-parameters: | - OPENSTACK_ENVIRONMENT=${OPENSTACK_ENVIRONMENT} - CUSTOM_HEAT_STACK_YAML=${CUSTOM_HEAT_STACK_YAML} - STACK_PREFIX=${STACK_PREFIX} - FLAVOR_NAME=${CUSTOM_FLAVOR_NAME} - JENKINS_LABELS=${CUSTOM_FLAVOR_JENKINS_LABELS} - IMAGE_NAME=${IMAGE_NAME} - GERRIT_REVIEW=${GERRIT_REVIEW} + OPENSTACK_ENVIRONMENT=${OPENSTACK_ENVIRONMENT} + HEAT_STACK_TEMPLATE_NAME=${HEAT_STACK_TEMPLATE_NAME} + STACK_PREFIX=${STACK_PREFIX} + FLAVOR_NAME=mos.fuel.huge.hdd_ext + JENKINS_LABELS=mos.fuel.huge + IMAGE_NAME=${IMAGE_NAME} + GERRIT_REVIEW=${GERRIT_REVIEW} - conditional-step: condition-kind: num-comp - lhs: $MOS_TEMPEST_NODE_COUNT + lhs: $MOS_BASE_HDD_EXT_NODE_COUNT rhs: 0 comparator: greater-than steps: @@ -55,15 +55,16 @@ - project: "deploy-heat-stack" block: true parameter-factories: - - factory: counterbuild - from: 1 - to: $MOS_TEMPEST_NODE_COUNT - step: 1 + - factory: counterbuild + from: 1 + to: $MOS_BASE_HDD_EXT_NODE_COUNT + step: 1 predefined-parameters: | OPENSTACK_ENVIRONMENT=${OPENSTACK_ENVIRONMENT} HEAT_STACK_TEMPLATE_NAME=${HEAT_STACK_TEMPLATE_NAME} STACK_PREFIX=${STACK_PREFIX} - FLAVOR_NAME=mos.tempest + FLAVOR_NAME=mos.fuel.base.hdd_ext + JENKINS_LABELS=mos.fuel.base IMAGE_NAME=${IMAGE_NAME} GERRIT_REVIEW=${GERRIT_REVIEW} - conditional-step: diff --git a/maintenance-ci/common/macroses/mos-jenkins-swarm-params.yaml b/maintenance-ci/common/macroses/mos-jenkins-swarm-params.yaml index f07145f..610c704 100644 --- a/maintenance-ci/common/macroses/mos-jenkins-swarm-params.yaml +++ b/maintenance-ci/common/macroses/mos-jenkins-swarm-params.yaml @@ -18,28 +18,16 @@ name: MOS_HUGE_NODE_COUNT default: "0" - string: - name: MOS_TEMPEST_NODE_COUNT + name: MOS_BASE_HDD_EXT_NODE_COUNT + default: "0" + - string: + name: MOS_HUGE_HDD_EXT_NODE_COUNT default: "0" - string: name: IMAGE_NAME default: maintenance-ci-mos-image - - string: - name: JENKINS_LABELS - default: '' - - string: - name: CUSTOM_FLAVOR_NAME - default: "" - - string: - name: CUSTOM_HEAT_STACK_YAML - default: "" - - string: - name: CUSTOM_FLAVOR_JENKINS_LABELS - default: "" - - string: - name: CUSTOM_FLAVOR_NODE_COUNT - default: "0" - string: name: GERRIT_REVIEW default: "" \ No newline at end of file diff --git a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml index 7a2ecdc..eff46d6 100644 --- a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml +++ b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml @@ -33,22 +33,7 @@ KVM_USE=false - one_controller_actions - multirole - - thread_7: - swarm-test/env-name-suffix: "multirack" - swarm-test/custom-overrides-plain-properties: | - MULTIPLE_NETWORKS=true - FUEL_STATS_ENABLED=true - - thread_usb: - swarm-test/env-name-suffix: "usb" - swarm-test/custom-overrides-plain-properties: | - ADMIN_BOOT_DEVICE=usb - SHOW_FUELMENU=true - ENABLE_BOOTMENU=true - thread_non_func_1 - - bonding_ha: - swarm-test/env-name-suffix: "bond" - swarm-test/custom-overrides-plain-properties: | - BONDING=true - bonding_ha_one_controller: swarm-test/env-name-suffix: "bond" swarm-test/custom-overrides-plain-properties: | @@ -61,18 +46,13 @@ - ha_neutron - ha_neutron_tun - ha_neutron_scale - - ha_neutron_public - ha_neutron_destructive - ha_neutron_destructive_vlan - - ha_neutron_destructive_vxlan - command_line - logrotate - ha_destructive_ceph_neutron - repeatable_image_based - custom_hostname - - repetitive_restart: - swarm-test/custom-overrides-plain-properties: | - PATCHING_RUN_RALLY=true - ready_node_reinstallation - error_node_reinstallation - bvt_ubuntu_bootstrap @@ -99,10 +79,6 @@ swarm-test/custom-overrides-plain-properties: | DISABLE_SSL=true - cgroup_ha - - multiracks_2: - swarm-test/env-name-suffix: "multirack" - swarm-test/custom-overrides-plain-properties: | - MULTIPLE_NETWORKS=true - support_dpdk: swarm-test/custom-overrides-plain-properties: | KVM_USE=true @@ -118,8 +94,6 @@ swarm-test/custom-overrides-plain-properties: | PERESTROIKA_REPO=http://perestroika-repo-tst.infra.mirantis.net/mos-repos/centos/mos-master-centos7/os/x86_64/ - unlock_settings_tab_states - - unlock_settings_tab: - swarm-test/timeout: '1800' - public_api: swarm-test/env-name-suffix: "dmz" swarm-test/custom-overrides-plain-properties: | @@ -149,6 +123,42 @@ - fuel_plugin_example - install_plugin_after_cluster_create - detach-rabbitmq-ci-group +########################################## + - mos/templates/swarm-test: + swarm-test/node: "mos.fuel.base.hdd_ext" + swarm-test/devops-hw-vars: | + ADMIN_NODE_CPU=4 + SLAVE_NODE_CPU=6 + ADMIN_NODE_MEMORY=4096 + SLAVE_NODE_MEMORY=4096 + ENABLE_BOOTMENU=false + testgroup: + - bonding_ha: + swarm-test/env-name-suffix: "bond" + swarm-test/custom-overrides-plain-properties: | + BONDING=true + - ha_neutron_destructive_vxlan + - ha_neutron_public + - multiracks_2: + swarm-test/env-name-suffix: "multirack" + swarm-test/custom-overrides-plain-properties: | + MULTIPLE_NETWORKS=true + - repetitive_restart: + swarm-test/custom-overrides-plain-properties: | + PATCHING_RUN_RALLY=true + - thread_7: + swarm-test/env-name-suffix: "multirack" + swarm-test/custom-overrides-plain-properties: | + MULTIPLE_NETWORKS=true + FUEL_STATS_ENABLED=true + - thread_usb: + swarm-test/env-name-suffix: "usb" + swarm-test/custom-overrides-plain-properties: | + ADMIN_BOOT_DEVICE=usb + SHOW_FUELMENU=true + ENABLE_BOOTMENU=true + - unlock_settings_tab: + swarm-test/timeout: '1800' ########################################## - mos/templates/swarm-test: # TODO: HUGE nodes, 8gb ram @@ -213,15 +223,6 @@ SLAVE_NODE_CPU=12 DRIVER_ENABLE_ACPI=true NUMA_NODES=2 - - deploy_multipath: - swarm-test/env-name-suffix: "multipath" - swarm-test/custom-overrides-plain-properties: | - MULTIPATH=True - SLAVE_MULTIPATH_DISKS_COUNT=2 - SLAVE_NODE_CPU=12 - DEVOPS_SETTINGS_TEMPLATE=$WORKSPACE/system_test/tests_templates/tests_configs/multipath_3_nodes.yaml - NODES_COUNT=4 - NODE_VOLUME_SIZE=40 - support_hugepages: swarm-test/env-name-suffix: "hugepages" swarm-test/custom-overrides-plain-properties: | @@ -237,4 +238,25 @@ swarm-test/env-name-suffix: "haproxy-detach" swarm-test/custom-overrides-plain-properties: | MULTIPLE_NETWORKS=true - USE_HAPROXY_TEMPLATE=true \ No newline at end of file + USE_HAPROXY_TEMPLATE=true +########################################## + - mos/templates/swarm-test: + # TODO: HUGE nodes, 8gb ram + swarm-test/node: "mos.fuel.huge.hdd_ext" + swarm-test/job-weight: '23' + swarm-test/devops-hw-vars: | + ADMIN_NODE_CPU=6 + SLAVE_NODE_CPU=12 + ADMIN_NODE_MEMORY=4096 + SLAVE_NODE_MEMORY=8192 + ENABLE_BOOTMENU=false + testgroup: + - deploy_multipath: + swarm-test/env-name-suffix: "multipath" + swarm-test/custom-overrides-plain-properties: | + MULTIPATH=True + SLAVE_MULTIPATH_DISKS_COUNT=2 + SLAVE_NODE_CPU=12 + DEVOPS_SETTINGS_TEMPLATE=$WORKSPACE/system_test/tests_templates/tests_configs/multipath_3_nodes.yaml + NODES_COUNT=4 + NODE_VOLUME_SIZE=40 \ No newline at end of file