Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Oxa/devfic stamp defaults #179

Merged
merged 4 commits into from Sep 6, 2017
Merged

Conversation

kabirkhan
Copy link
Contributor

What does this PR do? Please provide some context

We're assuming that people will clone this repo to deploy, so this provides default parameters for the arm template and parameter files to clean up the powershell deployment command.

Where should the reviewer start?

scripts/Deploy-OxaStamp.ps1

How can this be manually tested? (brief repro steps)

.\scripts\Deploy-OxaStamp.ps1 -AzureSubscriptionName "OXABVTENVIRONMENT" -ResourceGroupName "lexoxabvtc13" -Location "south central us" -TargetPath ".\config\stamp\default" -AadWebClientId "{SECRECT}" -AadWebClientAppKey "{SECRECT}" -AadTenantId "{SECRECT}" -ClusterAdministratorEmailAddress mlxdevops@microsoft.com -SmtpServer "smtpa-ch1.msn.com" -SmtpServerPort 25025 -SmtpAuthenticationUser "_MLXGME" -SmtpAuthenticationUserPassword "{SECRECT}" -PlatformName "Microsoft Learning" -EdxAppSuperUserName "oxamaster" -EdxAppSuperUserPassword "{SECRECT}" -EdxAppSuperUserEmail "oxamaster@microsoft.com" -PlatformEmailAddress "mlxswat@microsoft.com" -MemcacheServer 10.0.0.17 -AzureCliVersion 2

What are the relevant TFS items? (list id numbers)

Definition of done:

  • Title of the pull request is clear and informative
  • Add pull request hyperlink to relevant TFS items
  • For large or complex change: schedule an in-person review session
  • This change has appropriate test coverage

Reminders BEFORE merging

  1. Get at least two approvals
  2. If you're merging from a feature branch into the development branch then "flatten" or "squash" commits
  3. If merging from the development branch into master (or porting changes from upstream) then use github's UI to get review feedback, but use the git command line interface to complete the actual merge.

Reminders AFTER merging

  1. Delete the remote feature branch
  2. Resolve relevant TFS items
  3. (reverse merge) If you merged from the development branch into master then check to see if there are any changes in master that can be merged down to the development branch (like hotfixes, etc). In this case, use github's UI for feedback and the git command line interface for the actual merge.

@msftclas
Copy link

@kabirkhan,
Thanks for your contribution as a Microsoft full-time employee or intern. You do not need to sign a CLA.
Thanks,
Microsoft Pull Request Bot

@kabirkhan kabirkhan merged commit 07690c0 into oxa/devfic Sep 6, 2017
@kabirkhan kabirkhan deleted the oxa/devfic-stamp-defaults branch September 6, 2017 22:51
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.

None yet

3 participants