akeneo · valerie-schneider · Dec 14, 2021 · Feb 7, 2022 · Feb 8, 2022 · Feb 8, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,40 +2,37 @@ version: 2.1
 jobs:
     build:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2004:2022.04.1
         steps:
             - checkout
             - run: make build
 
     check-external-link:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2004:2022.04.1
         steps:
             - checkout
             - run: make lint
 
     deploy_staging:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2004:2022.04.1
         steps:
             - checkout
             - add_ssh_keys
             - run:
                   name: Deploy on staging server
-                  command: DEPLOY_HOSTNAME=$STAGING_HOSTNAME DEPLOY_PORT=$STAGING_PORT VERSION="6.0" make deploy
+                  command: DEPLOY_HOSTNAME=$STAGING_HOSTNAME DEPLOY_PORT=$STAGING_PORT VERSION="master" make deploy
 
     deploy_production:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2004:2022.04.1
         steps:
             - checkout
             - add_ssh_keys
             - run:
                   name: Deploy on production server
-                  command: DEPLOY_HOSTNAME=$PROD_HOSTNAME DEPLOY_PORT=$PROD_PORT VERSION="6.0" make deploy
-
-orbs:
-    pull-up: akeneo-orbs/[email protected]
+                  command: DEPLOY_HOSTNAME=$PROD_HOSTNAME DEPLOY_PORT=$PROD_PORT VERSION="master" make deploy
 
 workflows:
     version: 2
@@ -45,14 +42,14 @@ workflows:
                   filters:
                       branches:
                           ignore:
-                              - '6.0'
+                              - master
 
     deployment:
         jobs:
             - deploy_staging:
                   filters:
                       branches:
-                          only: '6.0'
+                          only: master
             - approve_to_deploy_in_production:
                   type: approval
                   requires:
@@ -61,27 +58,13 @@ workflows:
                   requires:
                       - approve_to_deploy_in_production
 
-    pull_up:
-        jobs:
-            - pull-up/pull-up:
-                  from: "6.0"
-                  into: "master"
-                  branch_prefix: "60_to_master"
-                  github_token: MICHEL_TAG_TOKEN
-                  github_username: "micheltag"
-                  slack_webhook: "${SLACK_URL_PULL_UP}"
-                  filters:
-                      branches:
-                          only:
-                              - "6.0"
-
     nightly:
         triggers:
             - schedule:
                   cron: "0 2 * * *"
                   filters:
                       branches:
                           only:
-                              - "6.0"
+                              - "master"
         jobs:
             - check-external-link
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM akeneo/pim-php-dev:6.0
+FROM akeneo/pim-php-dev:master
 WORKDIR /home/akeneo/pim-docs/
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/cloud_edition/flexibility_mode/docs/system_administration.rst b/cloud_edition/flexibility_mode/docs/system_administration.rst
@@ -65,7 +65,6 @@ Alias                        Argument                                     Action
 ``partners_systemctl <job>`` ``status|start|stop|restart|enable|disable`` Show status, start/stop/restart or enable/disable job consumers. Refer to `this page <job_consumers_and_workers.rst>`_ for more details
 ============================ ============================================ ======
 
-
 Third-party Software Installation
 ---------------------------------
 

diff --git a/cloud_edition/flexibility_mode/index.rst b/cloud_edition/flexibility_mode/index.rst
@@ -24,24 +24,38 @@ Types of environments
 
     The system components are based on :doc:`../../../install_pim/manual/system_requirements/system_requirements`.
 
-Updates and migrations
-----------------------
-
-Updates can include **patches** and **new features**. Integrators are accountables for applying new patches and performing migrations on the PIM.
+PIM updates and migrations
+--------------------------
+
+Following the `Semantic Version <https://semver.org>`_, PIM has 2 main updates:
+
+- patches or minors versions:
+    Can include **bug fixes** and **new features**.
+    Integrators are accountable for applying new patches and performing migrations on the PIM.
+    You can refer to :doc:`../../../migrate_pim/upgrade_minor_version` for more details about the procedure.
+- majors versions:
+    Requires **new versions** of software and various components.
+    Please contact us through the `Helpdesk > Cloud Flexibility and Serenity <https://akeneo.atlassian.net/servicedesk/customer/portal/8/group/23/create/93?summary=Technological%20stack%20upgrade%20for%20PIM&customfield_13302=12701&customfield_13395=13010&customfield_13395%3A1=13016&description=--%21--%20%20Operation%20scheduling%3A%0A--%21--%20%20%20%20-%202h%20downtime%20expected%0A--%21--%20%20%20%20-%20French%20Office%20Hours%0A--%21--%20%20%20%20-%20Should%20be%20scheduled%2048h%20in%20advance%0A--%21--%20%20Please%20offer%20us%20several%20dates%20and%20we%20will%20confirm%20the%20one%20that%20also%20corresponds%20to%20our%20availability>`_  to schedule the upgrade of the technological stack.
+    Then integrators are accountable for performing the PIM migration.
+    You can refer to :doc:`../../../migrate_pim/upgrade_major_version` for more details about the procedure.
+
+Quarterly System updates
+------------------------
 
-You can refer to :doc:`../../../migrate_pim/index` for more details about the procedure.
+In order for you to benefit the best of Flexibility experience, Akeneo schedules system updates on a quarterly basis.
+These updates include **security patches** and **system improvements**.
 
-.. note::
+They will be scheduled every last Wednesday/Thursday of the quarter following these time slots:
 
-    Major upgrades can require **new versions** of software and various components.
-    Please contact us through the `Helpdesk > Cloud Flexibility and Serenity <https://akeneo.atlassian.net/servicedesk/customer/portal/8/group/23/create/93?summary=Technological%20stack%20upgrade%20for%20PIM&customfield_13302=12701&customfield_13395=13010&customfield_13395%3A1=13016&description=--%21--%20%20Operation%20scheduling%3A%0A--%21--%20%20%20%20-%202h%20downtime%20expected%0A--%21--%20%20%20%20-%20French%20Office%20Hours%0A--%21--%20%20%20%20-%20Should%20be%20scheduled%2048h%20in%20advance%0A--%21--%20%20Please%20offer%20us%20several%20dates%20and%20we%20will%20confirm%20the%20one%20that%20also%20corresponds%20to%20our%20availability>`_  to schedule the upgrade of the tech stack.
+- Asia/Australia: Starting **Wednesday at 3pm CET/CEST**
+- Europe: Starting **Wednesday at 6pm CET/CEST**
+- US: Starting **Thursday at 9am CET/CEST**
 
 Backups management
 ------------------
 
 A snapshot of your production instance is made regularly and can be restored upon request.
 
-
 Manage your environments
 ------------------------
 .. toctree::

diff --git a/conf.py b/conf.py
@@ -57,7 +57,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = os.getenv('PIM_VERSION', '6.0')
+version = os.getenv('PIM_VERSION', 'master')
 
 # Warning: These versions will be deleted on documentation deploy.
 versions = os.getenv('PIM_VERSIONS', 'master')

diff --git a/contribute_to_pim/create_connector.rst b/contribute_to_pim/create_connector.rst
@@ -3,8 +3,8 @@ How to contribute to a Connector?
 
 We're happy to connect the PIM to any third-party system!
 
-* Begin by checking on the `Akeneo PIM Marketplace`_ that nobody published a connector for a 3rd party system
+* Begin by checking on the `Akeneo App Store`_ that nobody published a connector for a 3rd party system
 * Create your connector :doc:`/import_and_export_data/guides/create-connector`
-* Reference it on the `Akeneo PIM Marketplace`_
+* Reference it on the `Akeneo App Store`_
 
-.. _Akeneo PIM Marketplace: https://marketplace.akeneo.com/
+.. _Akeneo App Store: https://marketplace.akeneo.com/
diff --git a/contribute_to_pim/tests/establishing_decorator_pattern.rst b/contribute_to_pim/tests/establishing_decorator_pattern.rst
@@ -86,7 +86,7 @@ Navigate And Change The Current Page
     }
 
 Selenium will know which URL to go to thanks to `the protected $path attribute
-<https://github.com/akeneo/pim-community-dev/blob/6.0/tests/legacy/features/Context/Page/Role/Edit.php#L19>`_
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Context/Page/Role/Edit.php#L19>`_
 contained in *Context\\Page\\Role\\Edit*.
 
 You may notice that this Gherkin method still uses the old implementation of Behat in Akeneo PIM.
@@ -102,7 +102,7 @@ This organization is very helpful to quickly find the context you are looking fo
 
 We are working on permissions that are localized in the system main menu. So let's see the
 `\\Pim\\Behat\\Context\\Domain\\System\\PermissionsContext
-<https://github.com/akeneo/pim-community-dev/blob/6.0/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_.
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_.
 
 .. image:: images/PermissionsContext.png
 
@@ -149,12 +149,12 @@ Pages
 _____
 
 The current page is `Context\\Page\\Role\\Edit
-<https://github.com/akeneo/pim-community-dev/blob/6.0/tests/legacy/features/Context/Page/Role/Edit.php>`_.
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Context/Page/Role/Edit.php>`_.
 
 When you call *Pim\\Behat\\Context\\NavigationContext->getCurrentPage()* the method will match "Role edit" to
 *return new Context\\Page\\Role\\Edit()*. That's why all of our pages are located in a folder named after the name of
 the Entity. In this folder, each action has its dedicated page such as Index.php, Creation.php, Edit.php as you can see
-in the `Role folder <https://github.com/akeneo/pim-community-dev/tree/6.0/tests/legacy/features/Context/Page/Role>`_ for example.
+in the `Role folder <https://github.com/akeneo/pim-community-dev/tree/master/tests/legacy/features/Context/Page/Role>`_ for example.
 
 .. image:: images/edit.png
 
@@ -247,7 +247,7 @@ The name of the sub-folder is only the representative name of the element, no pr
 have to be suffixed by "Decorator" like *DecoratedElementDecorator*.
 
 The `Pim\\Behat\\Decorator\\Permission\\PermissionDecorator
-<https://github.com/akeneo/pim-community-dev/blob/6.0/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_
 adds behaviors to an Element to be able to navigate between groups and grant or revoke permissions for resources or groups.
 
 .. image:: images/decorator.png
@@ -303,7 +303,7 @@ The method *$this->find()* is neither in the decorator nor in the abstract class
 
 That's how we can call methods from the Element class inside decorators. And obviously, that's why all decorators must
 extend `Pim\\Behat\\Decorator\\ElementDecorator
-<https://github.com/akeneo/pim-community-dev/blob/6.0/tests/legacy/features/Behat/Decorator/ElementDecorator.php>`_.
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Behat/Decorator/ElementDecorator.php>`_.
 
 .. note::
 

diff --git a/contribute_to_pim/tests/index.rst b/contribute_to_pim/tests/index.rst
@@ -2,7 +2,7 @@ How behavior tests are architectured in the PIM?
 ================================================
 
 
-The PIM comes with a set of Behat scenarios: https://github.com/akeneo/pim-community-dev/tree/6.0/tests/legacy/features
+The PIM comes with a set of Behat scenarios: https://github.com/akeneo/pim-community-dev/tree/master/tests/legacy/features
 
 .. warning::
 

diff --git a/contribute_to_pim/translate.rst b/contribute_to_pim/translate.rst
@@ -36,13 +36,13 @@ Then, copy the translations in the right folders:
 
 .. code-block:: bash
 
-    cp -r crowdin_archive/6.0/Community/* your_app/vendor/akeneo/pim-community-dev/
+    cp -r crowdin_archive/master/Community/* your_app/vendor/akeneo/pim-community-dev/
 
 If you use the Enterprise Edition, run this command too:
 
 .. code-block:: bash
 
-    cp -r crowdin_archive/6.0/Enterprise/* your_app/vendor/akeneo/pim-enterprise-dev/
+    cp -r crowdin_archive/master/Enterprise/* your_app/vendor/akeneo/pim-enterprise-dev/
 
 Then, update the parameters of `your_app/vendor/akeneo/pim-community-dev/src/Akeneo/Platform/Bundle/UIBundle/Resources/config/locale_provider.yml` to change the minimum percentage and add your new language (here, 10% and Hungarian):
 

diff --git a/import_and_export_data/simple-import.rst b/import_and_export_data/simple-import.rst
@@ -1,8 +1,8 @@
 How import works
 ================
 
-.. _minimal: https://github.com/akeneo/pim-community-dev/tree/6.0/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/minimal
-.. _icecat: https://github.com/akeneo/pim-community-dev/tree/6.0/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/icecat_demo_dev
+.. _minimal: https://github.com/akeneo/pim-community-dev/tree/master/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/minimal
+.. _icecat: https://github.com/akeneo/pim-community-dev/tree/master/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/icecat_demo_dev
 
 At any time, a set of data can be imported: products, attributes, users, etc.
 

diff --git a/manipulate_pim_data/mass_edition/register_a_new_mass_edit_action.rst b/manipulate_pim_data/mass_edition/register_a_new_mass_edit_action.rst
@@ -8,7 +8,7 @@ on selected products.
 Prerequisite
 ------------
 The mass edit action uses the `BatchBundle
-<https://github.com/akeneo/pim-community-dev/tree/6.0/src/Akeneo/Tool/Bundle/BatchBundle>`_ in order to run mass edit in the background. Readers and Writers are already
+<https://github.com/akeneo/pim-community-dev/tree/master/src/Akeneo/Tool/Bundle/BatchBundle>`_ in order to run mass edit in the background. Readers and Writers are already
 created so in this cookbook we will focus on how to create a Mass Edit Action and create a Processor.
 For more information on how to create Jobs, Readers, Processors, or Writers please see :doc:`/import_and_export_data/index`.
 

diff --git a/manipulate_pim_data/non-product/create.rst b/manipulate_pim_data/non-product/create.rst
@@ -1,7 +1,7 @@
 How to Create Non-Product Objects
 =================================
 
-.. _SimpleFactoryInterface: https://github.com/akeneo/pim-community-dev/blob/6.0/src/Akeneo/Tool/Component/StorageUtils/Factory/SimpleFactoryInterface.php
+.. _SimpleFactoryInterface: https://github.com/akeneo/pim-community-dev/blob/master/src/Akeneo/Tool/Component/StorageUtils/Factory/SimpleFactoryInterface.php
 
 To create common objects, we rely on different methods depending on the complexity of the object. There are some examples on how to use these services.
 

diff --git a/migrate_pim/upgrade/upgrade_from_40_to_50.rst b/migrate_pim/upgrade/upgrade_from_40_to_50.rst
@@ -234,3 +234,9 @@ From that point, you will have to migrate your bundle one by one.
 
 Remember to check if they are still relevant, as each Akeneo version
 brings new features.
+
+
+Setting up the Events API
+*************************
+
+Configure your Events API with :doc:`/install_pim/manual/events_api`
diff --git a/migrate_pim/upgrade/upgrade_from_50_to_60.rst b/migrate_pim/upgrade/upgrade_from_50_to_60.rst
@@ -7,7 +7,7 @@ Disclaimer
 **********
 
 Make sure your production database is backed-up before performing the data migration.
-The queue daemon(s) must be stopped as well.
+The queue daemon(s) must be stopped as well (:doc:`/cloud_edition/flexibility_mode/docs/job_consumers_and_workers`).
 
 Prepare your project for the new technical stack
 ************************************************