Skip to content
This repository was archived by the owner on Aug 3, 2026. It is now read-only.

SE-2170 Port changes not yet merged to upstream into our juniper release branch #225 - #129

Merged
pomegranited merged 6 commits into
opencraft-release/juniper.2from
jill/juniper-code-drift
Jul 27, 2020
Merged

SE-2170 Port changes not yet merged to upstream into our juniper release branch #225#129
pomegranited merged 6 commits into
opencraft-release/juniper.2from
jill/juniper-code-drift

Conversation

@pomegranited

@pomegranited pomegranited commented Jul 18, 2020

Copy link
Copy Markdown

This branch starts with the tagged upstream open-release/juniper.2, and adds in the code drift that was present in opencraft-release/ironwood.2 which has not yet been merged upstream.

See open-craft/openedx-platform#225 for testing instructions.

Reviewer

CC @lgp171188

Guruprasad Lakshmi Narayanan and others added 5 commits July 18, 2020 12:51
Allow setting SiteConfiguration values for the default site or a
specific site by id or domain when provisioning an instance.

(cherry picked from commit e805a57)
(cherry picked from commit 436092e)
(cherry picked from commit e7b91fb)
Setting this variable to `True` disables handling the IP disclosure within private subnetworks.

(cherry picked from commit 8a79772)
@pomegranited
pomegranited marked this pull request as draft July 18, 2020 03:27
@pomegranited
pomegranited marked this pull request as ready for review July 18, 2020 08:04
@nizarmah
nizarmah self-requested a review July 18, 2020 11:29
@nizarmah

Copy link
Copy Markdown

There doesn't seem to be any Pull Requests in those cherry picked commits. Do I just need to just follow the test instructions on open-craft/openedx-platform#225, without testing anything in this pull request? Please let me know when possible @pomegranited

@pomegranited

Copy link
Copy Markdown
Author

@nizarmah

There doesn't seem to be any Pull Requests in those cherry picked commits

Sorry, I didn't edit the cherry-picked commits for this repo to add the pull request #. But if you follow the "cherry-picked from" revision link, github will show you the open PR it's related to.

For the ecommerce one, I haven't taken the trouble of setting up ecommerce on this test instance, because that's a bit involved. If you could just check that the cherry-pick went in cleanly and that the variable is still in use in the ecommerce config, that should be enough.

@nizarmah

Copy link
Copy Markdown

Alright, no worries @pomegranited, thank you for getting back to me about this though!

@nizarmah

nizarmah commented Jul 20, 2020

Copy link
Copy Markdown

Status of reviewing the cherry picked commits:

Regarding commit 436092e, I followed the following testing instructions as advised by @pomegranited

For the ecommerce one, I haven't taken the trouble of setting up ecommerce on this test instance, because that's a bit involved. If you could just check that the cherry-pick went in cleanly and that the variable is still in use in the ecommerce config, that should be enough.

I can confirm that the variable is still in use in the ecommerce config on open-release/juniper.2 branch.

Regarding commit 8a79772, an AWS Setup is required. Therefore, testing it will be postponed to when the ASU YTP instance is upgraded to Juniper. Discussion regarding this can be found here.

@nizarmah nizarmah left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

  • I tested this through:
  • Testing each cherry picked commit's pull request:
    • Read through the code
    • Followed the testing instructions for each pull request
  • I read through the code
  • I checked for accessibility issues
  • Includes documentation
  • I made sure any change in configuration variables is reflected in the corresponding client's configuration-secure repository.

@nizarmah
nizarmah self-requested a review July 24, 2020 05:45

@nizarmah nizarmah left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested the latest cherry picked commit a027b4b regarding "Remove repeated course data dir creation step", in the following way:

  • Tested each cherry picked commit as mentioned previously
  • Tried Importing/Exporting Courses in Studio

👍

@pomegranited
pomegranited merged commit a1f6f0a into opencraft-release/juniper.2 Jul 27, 2020
@pomegranited
pomegranited deleted the jill/juniper-code-drift branch July 27, 2020 10:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants