Skip to content

Conversation

@BaDos
Copy link
Contributor

@BaDos BaDos commented Sep 28, 2020

Description

As a Magento OnPrem Customer, I want to be able to apply patches with 'patch' command if I don't have 'Git' installed.

Currently, we have a recommendation  to use 'patch' command for patch applying. So probably some OnPrem customers don't have installed  'Git'  and can't use MQP tool.

Fixed Issues (if relevant)

MC 37324: Add fallback to 'patch' command when 'git' command is not available

https://jira.corp.magento.com/browse/MCLOUD-7069

Manual testing scenarios

Scenario 1 (GIT is installed, PATCH is installed)

Check that GIT is used to apply/revert patches and

  • Check that patch can be applied/reverted
  • Check that correct status is shown for patches in patch list (vendor/bin/magento-patches status)
  • Check that error message is shown if patch cannot be applied/reverted for some reason (e.g conflict)

Scenario 2 (GIT is not installed, PATCH is installed)

Check that PATCH is used to apply/revert patches and

  • Check that patch can be applied/reverted
  • Check that correct status is shown for patches in patch list (vendor/bin/magento-patches status)
  • Check that error message is shown if patch cannot be applied/reverted for some reason (e.g conflict)

Scenario 2 (GIT is not installed, PATCH is not installed)

Check that PATCH is used to apply/revert patches and

  • Check that patch cannot be applied/reverted and error message is shown to user that PATCH or GIT is required to apply/revert patches.

Release notes

Unix Patch command is now used to apply patches if GIT is not available.

Associated documentation updates

None

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • Pull request introduces user-facing changes and includes meaningful updates for any required release notes and documentation changes
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)

bubasuma and others added 15 commits September 16, 2020 17:37
…vailable

- Move exception handling from patch command implementations
…vailable

- Remove -f flag in patch command
- Fix services configuration
@bubasuma
Copy link
Contributor

@NadiyaS @bbatsche
Have you had a chance to look at this?

@andriyShevtsov
Copy link
Collaborator

QA approved

@andriyShevtsov andriyShevtsov added the Progress: approved PR/issue status label Oct 5, 2020
@m2-community-project m2-community-project bot removed the Progress: review PR/issue status label Oct 5, 2020
@andriyShevtsov andriyShevtsov removed their assignment Oct 5, 2020
@NadiyaS
Copy link
Contributor

NadiyaS commented Oct 5, 2020

@magento import pr to magento-commerce/magento-cloud-patches

@magento-engcom-team
Copy link
Contributor

@NadiyaS the pull request successfully imported.

@mmansoor-magento mmansoor-magento merged commit 21bd91d into develop Oct 6, 2020
@m2-community-project m2-community-project bot removed the Progress: approved PR/issue status label Oct 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants