Merge pull request #768 from magento/develop

Backport develop branch into 2002.1
magento · Aug 4, 2020 · c3f921f · c3f921f
2 parents 95ce8bc + 162d760
commit c3f921f
Show file tree

Hide file tree

Showing 205 changed files with 5,525 additions and 851 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,10 +15,10 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 
 env:
   - TEST_SUITE=functional-ce
-  - TEST_SUITE=functional-ee
   - TEST_SUITE=functional-ee FUNCTIONAL_INDEX=1
   - TEST_SUITE=functional-ee FUNCTIONAL_INDEX=2
   - TEST_SUITE=functional-ee FUNCTIONAL_INDEX=3
@@ -32,30 +32,24 @@ stages:
 jobs:
   exclude:
     - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=1
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=2
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=3
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=4
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=5
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=6
+      env: TEST_SUITE=functional-ee
 
     - php: '7.2'
       env: TEST_SUITE=functional-ee
 
     - php: '7.3'
       env: TEST_SUITE=functional-ee
 
+    - php: '7.4'
+      env: TEST_SUITE=functional-ee
+
 install:
   - composer config http-basic.repo.magento.com ${REPO_USERNAME_CE} ${REPO_PASSWORD_CE}
   - composer config github-oauth.github.com ${GITHUB_TOKEN}
   - if [ -n "${MCC_VERSION}" ]; then composer config repositories.mcc git [email protected]:magento/magento-cloud-components.git && composer require "magento/magento-cloud-components:${MCC_VERSION}" --no-update; fi;
   - if [ -n "${MCD_VERSION}" ]; then composer config repositories.mcd git [email protected]:magento/magento-cloud-docker.git && composer require "magento/magento-cloud-docker:${MCD_VERSION}" --no-update; fi;
   - if [ -n "${MCP_VERSION}" ]; then composer config repositories.mcp git [email protected]:magento/magento-cloud-patches.git && composer require "magento/magento-cloud-patches:${MCP_VERSION}" --no-update; fi;
+  - if [ -n "${MQP_VERSION}" ]; then composer config repositories.mqp git [email protected]:magento/quality-patches.git && composer require "magento/quality-patches:${MQP_VERSION}" --no-update; fi;
   - composer update -n --no-suggest
 
 before_script:

diff --git a/codeception.dist.yml b/codeception.dist.yml
@@ -20,6 +20,7 @@ modules:
       mcd_repo: "https://github.com/magento/magento-cloud-docker.git"
       mcc_repo: "https://github.com/magento/magento-cloud-components.git"
       mcp_repo: "https://github.com/magento/magento-cloud-patches.git"
+      mqp_repo: "https://github.com/magento/quality-patches.git"
       composer_magento_username: "%REPO_USERNAME%"
       composer_magento_password: "%REPO_PASSWORD%"
       composer_github_token: "%GITHUB_TOKEN%"

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/ece-tools",
   "description": "Provides tools to build and deploy Magento 2 Enterprise Edition",
   "type": "magento2-component",
-  "version": "2002.1.1",
+  "version": "2002.1.2",
   "license": "OSL-3.0",
   "repositories": {
     "repo.magento.com": {
@@ -21,9 +21,9 @@
     "graylog2/gelf-php": "^1.4.2",
     "guzzlehttp/guzzle": "^6.2",
     "illuminate/config": "^5.5",
-    "magento/magento-cloud-components": "^1.0.1",
+    "magento/magento-cloud-components": "^1.0.6",
     "magento/magento-cloud-docker": "^1.0.0",
-    "magento/magento-cloud-patches": "^1.0.0",
+    "magento/magento-cloud-patches": "^1.0.6",
     "monolog/monolog": "^1.16",
     "nesbot/carbon": "^1.0||^2.0",
     "psr/container": "^1.0",

diff --git a/config/schema.error.yaml b/config/schema.error.yaml
diff --git a/config/schema.yaml b/config/schema.yaml
@@ -643,6 +643,20 @@ variables:
       - stage:
           global:
             X_FRAME_CONFIGURATION: SAMEORIGIN
+  QUALITY_PATCHES:
+    description: Specify a list of Magento quality patches that will be applied during deployment.
+    type: array
+    stages:
+      - build
+    default:
+      build: []
+    examples:
+      - stage:
+          build:
+            QUALITY_PATCHES:
+              - MC-31387
+              - MDVA-4567
+              - MC-45634
 
   # Environment variables
   ENV_RELATIONSHIPS:

diff --git a/config/services.xml b/config/services.xml
@@ -113,6 +113,7 @@
         <service id="Magento\MagentoCloud\Config\EnvironmentDataInterface" alias="Magento\MagentoCloud\Config\EnvironmentData" />
         <service id="Magento\MagentoCloud\Config\Environment\ReaderInterface" alias="Magento\MagentoCloud\Config\Environment\Reader" />
         <service id="Magento\MagentoCloud\Config\Magento\Env\ReaderInterface" alias="Magento\MagentoCloud\Config\Magento\Env\Reader" />
+        <service id="Magento\MagentoCloud\App\Logger\Error\ReaderInterface" alias="Magento\MagentoCloud\App\Logger\Error\Reader" />
         <service id="Magento\MagentoCloud\Config\Magento\Env\WriterInterface" alias="Magento\MagentoCloud\Config\Magento\Env\Writer" />
         <service id="Magento\MagentoCloud\Config\Magento\Shared\ReaderInterface" alias="Magento\MagentoCloud\Config\Magento\Shared\Reader" />
         <service id="Magento\MagentoCloud\Config\Magento\Shared\WriterInterface" alias="Magento\MagentoCloud\Config\Magento\Shared\Writer" />