Skip to content

Commit b48bf77

Browse files
shiftedrealityshiftedreality
authored
Merge pull request #480 from magento/develop
Merge develop into 2002.0
2 parents da22016 + aa91717 commit b48bf77

File tree

172 files changed

+8667
-3738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+8667
-3738
lines changed

‎.travis.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,22 @@ php:
1212
- '7.1'
1313
- '7.2'
1414

15-
addons:
16-
apt:
17-
update: true
18-
1915
env:
2016
matrix:
2117
- TEST_SUITE=static-unit XDEBUG=true
2218
- TEST_SUITE=integration
23-
- TEST_SUITE=docker-integration
19+
- TEST_SUITE=functional
2420

25-
cache:
26-
apt: true
27-
directories:
28-
- $HOME/.composer/cache
21+
install: composer update -n --no-suggest
2922

30-
before_install:
23+
before_script:
3124
- echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./docker/composer.env
3225
- echo "COMPOSER_MAGENTO_PASSWORD=${REPO_PASSWORD}" >> ./docker/composer.env
3326
- if [ $XDEBUG == "true" ]; then echo "PHP_ENABLE_XDEBUG=true" >> ./docker/global.env; fi;
3427

35-
install: composer update -n --no-suggest
36-
37-
script: ./tests/travis/script.sh
28+
script:
29+
- if [ $TEST_SUITE == "static-unit" ]; then ./tests/travis/static-unit.sh; fi
30+
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "integration" ]; then ./tests/travis/integration.sh; fi
31+
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi
3832

3933
after_failure: docker ps -s

‎codeception.dist.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
paths:
2+
tests: src/Test/Functional
3+
output: tests/functional/_output
4+
data: tests/functional/_data
5+
support: tests/functional/_support
6+
envs: tests/functional/_envs
7+
actor_suffix: Tester
8+
settings:
9+
colors: true
10+
extensions:
11+
enabled:
12+
- Codeception\Extension\RunFailed
13+
params:
14+
- tests/functional/configuration.dist.yml
15+
modules:
16+
config:
17+
Magento\MagentoCloud\Test\Functional\Codeception\Docker:
18+
db_host: "%Magento.docker.settings.db.host%"
19+
db_port: "%Magento.docker.settings.db.port%"
20+
db_username: "%Magento.docker.settings.db.username%"
21+
db_password: "%Magento.docker.settings.db.password%"
22+
db_path: "%Magento.docker.settings.db.path%"
23+
repo_url: "%Magento.docker.settings.repo.url%"
24+
repo_branch: "%Magento.docker.settings.repo.branch%"
25+
system_ece_tools_dir: "%Magento.docker.settings.system.ece_dir%"
26+
system_magento_dir: "%Magento.docker.settings.system.magento_dir%"
27+
env_base_url: "%Magento.docker.settings.env.url.base%"
28+
env_secure_base_url: "%Magento.docker.settings.env.url.secure_base%"
29+
volumes:
30+
- /var/www/magento/pub/static
31+
- /var/www/magento/pub/media
32+
- /var/www/magento/var
33+
- /var/www/magento/app/etc
34+
PhpBrowser:
35+
url: "%Magento.docker.settings.env.url.base%"

‎composer.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
"phpunit/php-code-coverage": "^5.2",
2929
"phpunit/phpunit": "^6.2",
3030
"squizlabs/php_codesniffer": " ^3.0",
31-
"symfony/process": "^3.4"
31+
"symfony/process": "^3.4",
32+
"codeception/codeception": "^2.5.3",
33+
"consolidation/robo": "^1.2"
3234
},
3335
"replace": {
3436
"magento/ece-patches": "*",
@@ -49,7 +51,7 @@
4951
"psr-4": {
5052
"Magento\\MagentoCloud\\Test\\": "tests/static/",
5153
"Magento\\MagentoCloud\\Test\\Integration\\": "tests/integration/",
52-
"Magento\\MagentoCloud\\Test\\DockerIntegration\\": "tests/docker-integration/"
54+
"Magento\\MagentoCloud\\Test\\Functional\\": "tests/functional/"
5355
}
5456
},
5557
"scripts": {
@@ -80,20 +82,20 @@
8082
"docker/mnt"
8183
],
8284
[
83-
"dist/docker/mysql",
84-
"docker/mysql"
85-
],
86-
[
87-
"dist/docker/config.php",
88-
"docker/config.php.dist"
85+
"dist/docker/tmp",
86+
"docker/tmp"
8987
],
9088
[
91-
"dist/docker/global.php",
92-
"docker/global.php.dist"
89+
"dist/docker/mysql",
90+
"docker/mysql"
9391
],
9492
[
9593
"dist/docker/README.md",
9694
"docker/README.md"
95+
],
96+
[
97+
"dist/docker-sync.yml",
98+
"docker-sync.yml"
9799
]
98100
]
99101
}

‎dist/.magento.env.yaml

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#######################################################################################################################
22
# SCD_THREADS - the number of threads for static content deployment. #
3-
# Default value: 1 — Starter environments and Pro Integration environments #
4-
# 3 — Pro Staging and Production environments #
3+
# Default value: Automatic, based on the detected CPU thread count and does not exceed a value of 4. #
4+
# 1 - if Magento Version < 2.1.11 #
55
# Magento Version: 2.1.4 and later #
66
# Stages: global, build and deploy #
77
# Example: #
@@ -58,6 +58,19 @@
5858
# deploy: #
5959
# SCD_STRATEGY: "compact" #
6060
#######################################################################################################################
61+
# SCD_MAX_EXECUTION_TIME - allows you to increase the maximum expected execution time for the static content deploy #
62+
# command. #
63+
# By default, Magento Commerce sets the maximum expected execution to 400 seconds, #
64+
# but in some scenarios you might need more time to complete #
65+
# the static content deployment for a Cloud project. #
66+
# Magento Version: 2.2.0 and later #
67+
# Default value: not set #
68+
# Stages: global, build and deploy #
69+
# Example: #
70+
# stage: #
71+
# global: #
72+
# SCD_MAX_EXECUTION_TIME: 3600 #
73+
#######################################################################################################################
6174
# SKIP_SCD - skips static content deployment during the build/deploy phase. #
6275
# Magento Version: 2.1.4 and later #
6376
# Default value: not set #
@@ -249,6 +262,28 @@
249262
# elasticsearch_index_prefix: magento #
250263
# elasticsearch_server_timeout: '15' #
251264
#######################################################################################################################
265+
# ELASTICSUITE_CONFIGURATION - use this variable to retain customized ElasticSuite service settings #
266+
# between deployments. All configs provided in this configuration are nested in main ElasticSuite #
267+
# config section 'system/default/smile_elasticsuite_core_base_settings' #
268+
# Magento Version: 2.2.0 and later #
269+
# Default value: Depends on template configuration of ElasticSearch (i.e. default number of replicas and shards) #
270+
# and ElasticSearch host. #
271+
# es_client: #
272+
# servers: 'localhost:9200' #
273+
# indices_settings: #
274+
# number_of_shards: 1 #
275+
# number_of_replicas: 0 #
276+
# Stages: deploy #
277+
# Example: #
278+
# stage: #
279+
# deploy: #
280+
# ELASTICSUITE_CONFIGURATION: #
281+
# es_client: #
282+
# servers: 'remote-host:9200' #
283+
# indices_settings: #
284+
# number_of_shards: 3 #
285+
# number_of_replicas: 3 #
286+
#######################################################################################################################
252287
# CRON_CONSUMERS_RUNNER - use this variable to make sure message queues are running after a deployment. #
253288
# By default, the deployment process overwrites all settings in the env.php file #
254289
# cron_run — a boolean value that enables or disables the consumers_runner cron job. #
@@ -524,15 +559,6 @@
524559
# variables: #
525560
# ENV_APPLICATION: "MAGENTO_CLOUD_APPLICATION" #
526561
#######################################################################################################################
527-
# ENV_MODE - Environment variable used to get application mode. #
528-
# Magento Version: Magento 2.1.4 and later #
529-
# Default value: - "MAGENTO_CLOUD_MODE" #
530-
# Section: variables #
531-
# Example: #
532-
# system: #
533-
# variables: #
534-
# ENV_MODE: "MAGENTO_CLOUD_MODE" #
535-
#######################################################################################################################
536562
# ENV_ENVIRONMENT - Environment variable used to get application environment. #
537563
# Magento Version: Magento 2.1.4 and later #
538564
# Default value: - "MAGENTO_CLOUD_ENVIRONMENT" #

‎dist/docker-sync.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
syncs:
3+
magento:
4+
src: './'
5+
sync_excludes: ['.git', '.idea']

‎dist/docker/config.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎dist/docker/global.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎dist/docker/tmp/.gitignore

Whitespace-only changes.

‎patches.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"magento/magento2-base": {
3-
"Fix credis pipeline issue": {
4-
"2.1.4 - 2.1.10": "MAGETWO-67097__fix_credis_pipeline_bug__2.1.4.patch",
5-
"2.2.0": "MAGETWO-67097__fix_credis_pipeline_bug__2.1.4.patch"
6-
},
73
"Fix asset locker race condition when using Redis": {
84
"2.1.4 - 2.1.14": "MDVA-2470__fix_asset_locking_race_condition__2.1.4.patch",
95
"2.2.0 - 2.2.5": "MDVA-2470__fix_asset_locking_race_condition__2.2.0.patch"
@@ -64,6 +60,10 @@
6460
"2.2.2 - 2.2.3": "MAGECLOUD-1607__overhaul_cron_implementation__2.2.2.patch",
6561
"2.2.4": "MAGECLOUD-1607__overhaul_cron_implementation__2.2.4.patch"
6662
},
63+
"Add Zookeeper and flock locks": {
64+
"2.2.5 - 2.2.8": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.2.5.patch",
65+
"2.3.0 - 2.3.1": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.3.0.patch"
66+
},
6767
"Reduce memory usage when importing customers and addresses": {
6868
"2.1.4 - 2.1.10": "SET-36__fix_oom_during_customer_import__2.1.4.patch",
6969
"2.1.11 - 2.1.12": "SET-36__fix_oom_during_customer_import__2.1.11.patch",
@@ -120,6 +120,11 @@
120120
"Change the depth of a recursive check of directory write permissions": {
121121
"2.1.4 - 2.1.14": "MAGETWO-93265__fix_depth_of_recursive_check_of_directory_permissions__2.1.4.patch"
122122
},
123+
"Google chart API used by Magento dashboard scheduled to be turned off": {
124+
"2.1.4 - 2.1.17": "MAGETWO-98833__turn_off_google_chart_api__2.x.patch",
125+
"2.2.0 - 2.2.8": "MAGETWO-98833__turn_off_google_chart_api__2.x.patch",
126+
"2.3.0 - 2.3.1": "MAGETWO-98833__turn_off_google_chart_api__2.x.patch"
127+
},
123128
"Do not run cron when it is disabled": {
124129
"2.1.4 - 2.2.5": "MAGECLOUD-2445__do_not_run_cron_when_it_is_disabled__2.1.4.patch"
125130
},
@@ -140,6 +145,10 @@
140145
"2.1.4 - 2.2.1": "MAGECLOUD-2573__installation_without_admin_creation__2.1.4.patch",
141146
"2.2.2 - 2.2.7": "MAGECLOUD-2573__installation_without_admin_creation__2.2.2.patch"
142147
},
148+
"Add the possibility to configure max execution time during static content deployment": {
149+
"2.2.0 - 2.2.8 || 2.3.0": "MAGECLOUD-2822__configure_max_execution_time.patch",
150+
"2.3.1": "MAGECLOUD-2822__configure_max_execution_time_2.3.1.patch"
151+
},
143152
"Suppress PDO warnings to work around PHP bugs #63812, #74401": {
144153
"2.1.4": "MAGECLOUD-2820__implement_isolated_connections_mechanism__2.1.4.patch",
145154
"2.1.5 - 2.1.12": "MAGECLOUD-2820__implement_isolated_connections_mechanism__2.1.5.patch",
@@ -156,5 +165,17 @@
156165
"Fix monolog Slack Handler bug for magento 2.1.x": {
157166
"1.16.0": "MAGECLOUD-2793__fix_monolog_slack_handler_2.1.x.patch"
158167
}
168+
},
169+
"colinmollenhour/cache-backend-redis": {
170+
"The ability to read from the master Redis instance if the slave Redis is unavailable:": {
171+
"1.10.2": "MAGECLOUD-2899__fix_redis_slave_configuration__2.1.16.patch",
172+
"1.10.4": "MAGECLOUD-2899__fix_redis_slave_configuration__2.2.3.patch",
173+
"1.10.5": "MAGECLOUD-2899__fix_redis_slave_configuration__2.3.0.patch"
174+
}
175+
},
176+
"colinmollenhour/credis": {
177+
"Fix credis pipeline issue": {
178+
"1.6": "MAGETWO-67097__fix_credis_pipeline_bug__2.1.4.patch"
179+
}
159180
}
160181
}

0 commit comments

Comments
 (0)