Decouple the ecommerce repo

[nedbat]

The ecommerce repo has a number of open pull requests that we aren't interested to review, and don't want to risk merging. Can we separate our deployment from the main branch, and let the community move forward?

• The edx-rest-api-client repo has a pull request that would break ecommerce if merged (I think?)
• Do we change our deployments to use a 2u/release branch instead of master?
• We need to let everyone know what our plan is.
• Update the repos to clarify the contribution stance.

[nedbat]

@pshiu Let me know how we can work together on this.

[pshiu]

Thanks, @nedbat. I think the plan is to use the 2u/release branch as proposed. Ed was asking about this too, see: https://github.com/openedx/ecommerce/pull/3891#issuecomment-1380927126.

[pshiu]

@nedbat Created REV-3282 (2U-private link).

[nedbat]

Sounds like the plan is a sprint or two to get this done.

[nedbat]

As of today, there's a 2u/main branch, but 2U engineers are still committing to master:

% git lhist @ master
  * 580be6714 2023-04-14 (origin/master, origin/HEAD, master) fix: add an exec ex 2u max application check to the checkout flow. ENT-7059 Alex Dusenbery
  * 5c605ea26 2023-04-14 fix: fix codecov error Mohammad Ahtasham ul Hassan
  * 29e78ed41 2023-04-13 test: Add tests for Mobile IAP (#3937) Moeez Zahid
  * b5fa2e55e 2023-03-24 chore: Switch from edx-sphinx-theme to sphinx-book-theme Kshitij Sobti
  * ae883c32b 2023-04-12 feat: Added data_share_consent field to order fullfillment notes (#3939) irfanuddinahmad
  * a50fd85a3 2023-04-11 feat: add discount_jwt monitoring (#3944) Robert Raposa
  * 99fe1408e 2023-04-11 fix: cached monitoring (#3942) Robert Raposa
  * 405592f49 2023-04-11 (origin/open-release/palm.master) fix: reorder JWT decoders (#3941) Robert Raposa
  * c871aeed5 2023-04-10 feat: Added course and expires field in product form on ecommerce dashboard (#3938) jawad khan
  * 3ad694a3c 2023-04-03 fix: Return error in case of duplicate transaction_id for mobile (#3936) Moeez Zahid
  * fe975c4cc 2023-03-29 fix: Fix error in checkout api for mobile (#3934) Moeez Zahid
  * c22db3de0 2023-03-23 chore: add logging to debug ent-6954 (#3931) Adam Stankiewicz
  * 654dfb548 2023-03-23 feat: Error if products in basket are already purchased (#3929) Moeez Zahid
  * 4e117d097 2023-03-16 feat: Added Android refund api (#3922) jawad khan
  * 9495e3e1d 2023-03-16 fix: Pick the right purchase from ios response (#3921) jawad khan
  * c74de176b 2023-03-08 chore: quality Adam Stankiewicz
  * 64e89b857 2023-03-08 chore: add logging to include fulfillment details upon GEAG allocation exception Adam Stankiewicz
  * 3fb3c4eca 2023-03-08 fix: account for refunds in exec ed 2u redemption flow (#3920) Adam Stankiewicz
  * 0fc504078 2023-03-06 docs: Remove repo specific CONTRIBUTING.rst Feanil Patel
  * 62ba107c2 2023-02-23 build: Updating a missing workflow file `add-depr-ticket-to-depr-board.yml`. Feanil Patel
  * 3dfeacbeb 2023-02-23 build: Creating a missing workflow file `add-remove-label-on-comment.yml`. Feanil Patel
  * b782d39a2 2023-02-23 build: Creating a missing workflow file `self-assign-issue.yml`. Feanil Patel
  | * 9a9cf93c1 2023-03-07 (HEAD -> 2u/main, origin/2u/main) build: update workflows to include 2u release (#3917) wdrussell2015
  |/
  * a4feac1a2 2023-02-17 fix: [VAN-1292] Remove personalized recommendation cookie (#3911) Attiya Ishaque
  * 7d39ccbc1 2023-02-16 Enable In-app Purchases on Mobile App (#3893) Moeez Zahid
  * b9ba1def6 2023-02-07 Revert "temp: Log if Stripe keys are unset (#3906)" (#3909) Juliana Kang
  * 8c82b186b 2023-02-07 fix: Update configs payment variable for Stripe webhook endpoint (#3908) Juliana Kang
  * a3af1cb7f 2023-02-03 fix: Update Stripe webhook endpoint secure (#3905) Juliana Kang
  * 299efe39f 2023-02-03 temp: Log if Stripe keys are unset (#3906) Juliana Kang
  * 29cfb78ed 2023-02-01 docs: updates for updated Stripe payment processor (#3902) Phillip Shiu
  * edcf82f92 2023-01-31 fix: Stripe webhook decoding payload (#3903) Juliana Kang
  * b1b9b4f66 2023-01-31 feat: Secure Stripe webhooks endpoint (#3900) Juliana Kang

[nedbat]

@wdrussell2015 Can you update us on the status of this? The 2u/main branch still has not had any other commits since March 7th, but the https://2u-internal.atlassian.net/browse/THES-65 Jira issue is marked as Done.

[nedbat]

A new Jira issue (private link): https://2u-internal.atlassian.net/browse/REV-3528

[nedbat]

Latest thinking: this will happen in October after the Django 4.2 upgrade.

[e0d]

4.2 hasn't landed yet for the ecommerce application. We are blocked not by the process, but by capacity to make this change.

Should ecommerce worker also follow the branching strategy we are proposing here?

[christopappas]

@e0d yes, I think so, ecommerce-worker should also follow this pattern. To unblock the django42 upgrade for ecommerce for the community, we are going to begin this change now/soon. I am planning to send out some communications about this today in anticipation of this change coming