Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. Blended team creates a PR with a name matching the following template: [BD-XX][TNL-XXXX] PR name. This way a Jira ticket is automatically created in the Blended project.
    Example BD PR and its related BLENDED ticket.

  2. Once the PR is ready for the Blended team’s review, the author of the PR marks a related BLENDED ticket as ready for community review (Workflow → Open edX Community Review). This adds an

    Status
    colourGreen
    titleopen edx community review
    label to the GitHub PR.

  3. Usually (see Exceptions below), Blended team first reviews the PR internally. If there are requested changes, then after leaving all comments on the PR, they mark a related BLENDED ticket as Waiting on Author, which adds the

    Status
    colourBlue
    titlewaiting on author
    label to the GitHub PR.

    1. The PR's author:

      1. Addresses the comments.

      2. Makes necessary changes to the PR.

      3. Marks a related BLENDED ticket as ready for community review.

    2. Go back to point 3.

  4. Once all significant internal requested changes are addressed, a reviewer from the Blended team:

    1. Leaves an approval on the PR.
      Example approval.

    2. Marks a related BLENDED ticket as ready for edX review (Workflow → Review In Progress). This adds an

      Status
      colourGreen
      titleengineering review
      label to the GitHub PR.

  5. edX team reviews the PR. If there are requested changes, then after leaving all comments on the PR, they mark a related BLENDED ticket as Changes Requested, which adds the

    Status
    colourBlue
    titlechanges requested
    label to the GitHub PR.

    1. The PR's author:

      1. Addresses the comments.

      2. Makes necessary changes to the PR.

      3. Marks a related BLENDED ticket as ready for edX review.

    2. Go back to point 5.

  6. edX team leaves an approval on the PR and merges it.

  7. If a related ticket exists in edX Jira (example “upstream” ticket), then edX team marks it as

    Status
    colourGreen
    titleDone
    .

...