From cd66ee2746ff3d3605910e9fc7bf6178e86ce2f2 Mon Sep 17 00:00:00 2001 From: Barny Shergold Date: Mon, 19 Oct 2020 21:24:38 +0100 Subject: [PATCH] Correct number of Integration environments --- src/cloud/architecture/cloud-architecture.md | 4 ++-- src/cloud/live/stage-prod-live.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cloud/architecture/cloud-architecture.md b/src/cloud/architecture/cloud-architecture.md index 22e3baf6614..8a7c686dc21 100644 --- a/src/cloud/architecture/cloud-architecture.md +++ b/src/cloud/architecture/cloud-architecture.md @@ -55,7 +55,7 @@ For comparison, each plan includes the following infrastructure features and sup
  • New Relic Infrastructure on Production + APM (Performance Monitoring) on Staging and Production. The Managed alerts for {{ site.data.var.ee }} policy implements monitoring best practices to proactively notify you about application and infrastructure issues affecting site performance.
    • -
  • Platform-as-a-service (PaaS) based Integration development environments (8 total active environments) optimized for {{site.data.var.ee}}
    • +
  • Platform-as-a-service (PaaS) based Integration development environments (2 total active environments) optimized for {{site.data.var.ee}}
  • Infrastructure-as-a-Service (IaaS)—dedicated virtual infrastructure for Production environments and for Staging environments
    • @@ -107,6 +107,6 @@ The [Starter plan architecture]({{ site.baseurl }}/cloud/architecture/starter-ar The [Pro plan architecture]({{ site.baseurl }}/cloud/architecture/pro-architecture.html) has a global master with three environments: - **Integration**—The Integration environment provides a testable environment that includes a database, web server, caching, some services, environment variables, and configurations. You can develop, deploy, and test your code before merging to the Staging environment. - - _Inactive_—You can have an unlimited number of inactive branches based on the Integration environment. + - _Inactive_—You can have an unlimited number of inactive branches based on the Integration environment, but only one active branch (not including Integration itself). - **Staging**—The Staging environment is for pre-Production testing and includes a database, web server, caching, third-party services, environment variables, configurations, and services, such as Fastly. - **Production**—The Production environment includes a three-node, high-availability architecture for your data, services, caching, and store. This is your live, public store environment with environment variables, configurations, and third-party services. diff --git a/src/cloud/live/stage-prod-live.md b/src/cloud/live/stage-prod-live.md index 155c9d0dc79..40d99725d82 100644 --- a/src/cloud/live/stage-prod-live.md +++ b/src/cloud/live/stage-prod-live.md @@ -31,7 +31,7 @@ For detailed information of the process, see [Starter Develop and Deploy Workflo ## Pro plan deployment {#pro} -Pro comes with a large Integration environment with eight active branches and environments including `master`, Staging, and Production. When you create your project, code is ready to branch, develop, and push for building and deploying your site. Although the Integration environment can have many branches, Staging and Production have only one branch: the deployed Git `master`. +Pro comes with a large Integration environment with two active branches and environments including `master`, Staging, and Production. When you create your project, code is ready to branch, develop, and push for building and deploying your site. Although the Integration environment can have many branches, Staging and Production have only one branch: the deployed Git `master`. 1. Create development branches from the Integration `master` branch. 1. Develop on local: custom modules, Magento extensions, 3rd party integrations, and configurations.