Skip to content

Commit f12bff2

Browse files
duhonduhon
committed
Merge remote-tracking branches 'helix/MAGETWO-95075' and 'helix/MAGETWO-94384' into pr_helix_2.2
2 parents 6b37384 + 7dab529 commit f12bff2

File tree

6 files changed

+20
-35
lines changed

6 files changed

+20
-35
lines changed

‎setup/performance-toolkit/config/description.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
-->
88
<description>
99
<paragraphs>
10-
<count-min>4</count-min>
11-
<count-max>10</count-max>
10+
<count-min>7</count-min>
11+
<count-max>7</count-max>
1212

1313
<sentences>
14-
<count-min>10</count-min>
15-
<count-max>15</count-max>
14+
<count-min>12</count-min>
15+
<count-max>12</count-max>
1616

1717
<words>
18-
<count-min>5</count-min>
19-
<count-max>7</count-max>
18+
<count-min>6</count-min>
19+
<count-max>6</count-max>
2020
</words>
2121
</sentences>
2222
</paragraphs>

‎setup/performance-toolkit/profiles/ce/extra_large.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<attribute>
2424
<options>8</options>
2525
</attribute>
26-
<attribute>
27-
<options>5</options>
28-
</attribute>
2926
</attributes>
3027
<sku>Configurable Product %s</sku>
3128
<products>16000</products>
@@ -43,9 +40,9 @@
4340
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
4441
<cart_price_rules_floor>2</cart_price_rules_floor>
4542

46-
<product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
47-
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
48-
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
43+
<product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
44+
<product_attribute_sets_attributes>30</product_attribute_sets_attributes> <!-- Number of attributes per set -->
45+
<product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
4946

5047
<order_quotes_enable>true</order_quotes_enable>
5148
<order_simple_product_count_from>2</order_simple_product_count_from>

‎setup/performance-toolkit/profiles/ce/large.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<attribute>
2424
<options>8</options>
2525
</attribute>
26-
<attribute>
27-
<options>5</options>
28-
</attribute>
2926
</attributes>
3027
<sku>Configurable Product %s</sku>
3128
<products>8000</products>
@@ -43,9 +40,9 @@
4340
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
4441
<cart_price_rules_floor>2</cart_price_rules_floor>
4542

46-
<product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
47-
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
48-
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
43+
<product_attribute_sets>50</product_attribute_sets> <!-- Number of product attribute sets -->
44+
<product_attribute_sets_attributes>20</product_attribute_sets_attributes> <!-- Number of attributes per set -->
45+
<product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
4946

5047
<order_quotes_enable>true</order_quotes_enable>
5148
<order_simple_product_count_from>2</order_simple_product_count_from>

‎setup/performance-toolkit/profiles/ce/medium.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<attribute>
2424
<options>8</options>
2525
</attribute>
26-
<attribute>
27-
<options>5</options>
28-
</attribute>
2926
</attributes>
3027
<sku>Configurable Product %s</sku>
3128
<products>640</products>
@@ -43,9 +40,9 @@
4340
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
4441
<cart_price_rules_floor>2</cart_price_rules_floor>
4542

46-
<product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
47-
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
48-
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
43+
<product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
44+
<product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
45+
<product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
4946

5047
<order_quotes_enable>true</order_quotes_enable>
5148
<order_simple_product_count_from>2</order_simple_product_count_from>

‎setup/performance-toolkit/profiles/ce/medium_msite.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<attribute>
2424
<options>8</options>
2525
</attribute>
26-
<attribute>
27-
<options>5</options>
28-
</attribute>
2926
</attributes>
3027
<sku>Configurable Product %s</sku>
3128
<products>800</products>
@@ -49,9 +46,9 @@
4946
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
5047
<cart_price_rules_floor>2</cart_price_rules_floor>
5148

52-
<product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
53-
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
54-
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
49+
<product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
50+
<product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
51+
<product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
5552

5653
<order_quotes_enable>true</order_quotes_enable>
5754
<order_simple_product_count_from>2</order_simple_product_count_from>

‎setup/performance-toolkit/profiles/ce/small.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<attribute>
2424
<options>8</options>
2525
</attribute>
26-
<attribute>
27-
<options>5</options>
28-
</attribute>
2926
</attributes>
3027
<sku>Configurable Product %s</sku>
3128
<products>16</products>
@@ -44,8 +41,8 @@
4441
<cart_price_rules_floor>2</cart_price_rules_floor>
4542

4643
<product_attribute_sets>10</product_attribute_sets> <!-- Number of product attribute sets -->
47-
<product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
48-
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
44+
<product_attribute_sets_attributes>5</product_attribute_sets_attributes> <!-- Number of attributes per set -->
45+
<product_attribute_sets_attributes_values>5</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
4946

5047
<order_quotes_enable>true</order_quotes_enable>
5148
<order_simple_product_count_from>2</order_simple_product_count_from>

0 commit comments

Comments
 (0)