Skip to content

Commit

Permalink
Merge remote-tracking branches 'helix/MAGETWO-95075' and 'helix/MAGET…
Browse files Browse the repository at this point in the history 
…WO-94384' into pr_helix_2.2
  • Loading branch information
@duhon
duhon committed Sep 28, 2018
2 parents 6b37384 + 7dab529 commit f12bff2
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 35 deletions.
12 changes: 6 additions & 6 deletions setup/performance-toolkit/config/description.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
-->
<description>
<paragraphs>
<count-min>4</count-min>
<count-max>10</count-max>
<count-min>7</count-min>
<count-max>7</count-max>

<sentences>
<count-min>10</count-min>
<count-max>15</count-max>
<count-min>12</count-min>
<count-max>12</count-max>

<words>
<count-min>5</count-min>
<count-max>7</count-max>
<count-min>6</count-min>
<count-max>6</count-max>
</words>
</sentences>
</paragraphs>
Expand Down
9 changes: 3 additions & 6 deletions setup/performance-toolkit/profiles/ce/extra_large.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<attribute>
<options>8</options>
</attribute>
<attribute>
<options>5</options>
</attribute>
</attributes>
<sku>Configurable Product %s</sku>
<products>16000</products>
Expand All @@ -43,9 +40,9 @@
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
<cart_price_rules_floor>2</cart_price_rules_floor>

<product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
<product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>30</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->

<order_quotes_enable>true</order_quotes_enable>
<order_simple_product_count_from>2</order_simple_product_count_from>
Expand Down
9 changes: 3 additions & 6 deletions setup/performance-toolkit/profiles/ce/large.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<attribute>
<options>8</options>
</attribute>
<attribute>
<options>5</options>
</attribute>
</attributes>
<sku>Configurable Product %s</sku>
<products>8000</products>
Expand All @@ -43,9 +40,9 @@
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
<cart_price_rules_floor>2</cart_price_rules_floor>

<product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
<product_attribute_sets>50</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>20</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->

<order_quotes_enable>true</order_quotes_enable>
<order_simple_product_count_from>2</order_simple_product_count_from>
Expand Down
9 changes: 3 additions & 6 deletions setup/performance-toolkit/profiles/ce/medium.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<attribute>
<options>8</options>
</attribute>
<attribute>
<options>5</options>
</attribute>
</attributes>
<sku>Configurable Product %s</sku>
<products>640</products>
Expand All @@ -43,9 +40,9 @@
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
<cart_price_rules_floor>2</cart_price_rules_floor>

<product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
<product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->

<order_quotes_enable>true</order_quotes_enable>
<order_simple_product_count_from>2</order_simple_product_count_from>
Expand Down
9 changes: 3 additions & 6 deletions setup/performance-toolkit/profiles/ce/medium_msite.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<attribute>
<options>8</options>
</attribute>
<attribute>
<options>5</options>
</attribute>
</attributes>
<sku>Configurable Product %s</sku>
<products>800</products>
Expand All @@ -49,9 +46,9 @@
<cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
<cart_price_rules_floor>2</cart_price_rules_floor>

<product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
<product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->

<order_quotes_enable>true</order_quotes_enable>
<order_simple_product_count_from>2</order_simple_product_count_from>
Expand Down
7 changes: 2 additions & 5 deletions setup/performance-toolkit/profiles/ce/small.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<attribute>
<options>8</options>
</attribute>
<attribute>
<options>5</options>
</attribute>
</attributes>
<sku>Configurable Product %s</sku>
<products>16</products>
Expand All @@ -44,8 +41,8 @@
<cart_price_rules_floor>2</cart_price_rules_floor>

<product_attribute_sets>10</product_attribute_sets> <!-- Number of product attribute sets -->
<product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
<product_attribute_sets_attributes>5</product_attribute_sets_attributes> <!-- Number of attributes per set -->
<product_attribute_sets_attributes_values>5</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->

<order_quotes_enable>true</order_quotes_enable>
<order_simple_product_count_from>2</order_simple_product_count_from>
Expand Down

0 comments on commit f12bff2

Please sign in to comment.