Skip to content

Commit

Permalink
Resolves #15
Browse files Browse the repository at this point in the history
  • Loading branch information
@devkeydet
devkeydet committed Oct 18, 2017
1 parent afacd0b commit f08e84e
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 100 deletions.
89 changes: 39 additions & 50 deletions Primary Release - Dynamics + Azure.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"source": 2,
"id": 2,
"revision": 44,
"revision": 50,
"name": "Primary Release - Dynamics + Azure",
"description": null,
"createdBy": {
Expand All @@ -19,7 +19,7 @@
"url": "https://app.vssps.visualstudio.com/A23c752fb-0c7e-40ce-b5fc-276e6094b415/_apis/Identities/6582fd44-c7b5-6af6-8054-e8e93761fc9c",
"imageUrl": "https://dkdtdevops.visualstudio.com/_api/_common/identityImage?id=6582fd44-c7b5-6af6-8054-e8e93761fc9c"
},
"modifiedOn": "2017-10-17T02:10:59.413Z",
"modifiedOn": "2017-10-18T00:30:41.900Z",
"path": "\\",
"variables": {
"aadInstanceUrl": {
Expand All @@ -31,9 +31,6 @@
"dynConnectionString": {
"value": "AuthType=Office365;Username=$(dynUserName);Url=$(dynUrl);Password=$(dynPassword)"
},
"dynInstanceType": {
"value": "Sandbox"
},
"dynMgmtApiUrl": {
"value": "https://admin.services.crm.dynamics.com"
},
Expand Down Expand Up @@ -80,9 +77,6 @@
"value": null,
"isSecret": true
},
"dynServiceVersionId": {
"value": "31cafafe-c6b1-4c0a-bb53-73927841bc5c"
},
"dynTenant": {
"value": "yourtenant.onmicrosoft.com"
},
Expand Down Expand Up @@ -213,7 +207,7 @@
"scriptName": "",
"arguments": "",
"workingFolder": "",
"inlineScript": "$env:dateTimeStamp = Get-Date -format 'u'",
"inlineScript": "# Set dateTimeStamp VSTS variable for use by backup instance label\n\n$env:dateTimeStamp = Get-Date -format 'u'\n\n# NOTE: There's an issue with backups using the current \"reset\" approach (delete/provision). See: https://github.com/devkeydet/dyn365-ce-devops/issues/22",
"failOnStandardError": "true"
}
},
Expand Down Expand Up @@ -245,31 +239,10 @@
}
},
{
"taskId": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"version": "1.*",
"name": "Install-Module Microsoft.Xrm.OnlineManagementAPI",
"refName": "ClonedPowerShell11",
"enabled": true,
"alwaysRun": false,
"continueOnError": false,
"timeoutInMinutes": 0,
"definitionType": "task",
"overrideInputs": {},
"condition": "succeeded()",
"inputs": {
"scriptType": "inlineScript",
"scriptName": "",
"arguments": "",
"workingFolder": "",
"inlineScript": "Write-Host \"Installing Microsoft.Xrm.OnlineManagementAPI...\"\n\nInstall-Module Microsoft.Xrm.OnlineManagementAPI -SkipPublisherCheck -Force -Scope CurrentUser",
"failOnStandardError": "true"
}
},
{
"taskId": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"version": "1.*",
"name": "Download Reset Dynamics 365 Instance Script",
"refName": "ClonedPowerShell22",
"taskId": "764581cb-fc00-4969-bb1a-ec39f59b86f7",
"version": "8.*",
"name": "Reset Instance Part I (Delete)",
"refName": "MSCRMDeleteOnlineInstance1",
"enabled": true,
"alwaysRun": false,
"continueOnError": false,
Expand All @@ -278,19 +251,19 @@
"overrideInputs": {},
"condition": "succeeded()",
"inputs": {
"scriptType": "inlineScript",
"scriptName": "",
"arguments": "",
"workingFolder": "$(System.DefaultWorkingDirectory)/Primary Build/drop",
"inlineScript": "# I've asked for tasks to be added to the following VSTS extension:\n# https://github.com/WaelHamze/xrm-ci-framework/issues/46 (vote it up)\n# Until then, this approach will get the job done.\n\n$url = \"https://raw.githubusercontent.com/devkeydet/dyn365-ce-mgmt-api-devops-scripts/1.1/ResetInstanceByDomainName.ps1\"\n$output = \"ResetInstanceByDomainName.ps1\"\nInvoke-WebRequest -Uri $url -OutFile $output",
"failOnStandardError": "true"
"apiUrl": "$(dynMgmtApiUrl)",
"username": "$(dynUserName)",
"Password": "$(dynPassword)",
"instanceName": "$(dynDomain)",
"waitForCompletion": "true",
"sleepDuration": "5"
}
},
{
"taskId": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"version": "1.*",
"name": "Reset Dynamics 365 Instance",
"refName": "ClonedPowerShell13",
"taskId": "75b16512-23b8-49bd-9f31-c56d491207ad",
"version": "8.*",
"name": "Reset Instance Part II (Provision)",
"refName": "MSCRMProvisionOnlineInstance2",
"enabled": true,
"alwaysRun": false,
"continueOnError": false,
Expand All @@ -299,12 +272,28 @@
"overrideInputs": {},
"condition": "succeeded()",
"inputs": {
"scriptType": "filePath",
"scriptName": "$(System.DefaultWorkingDirectory)/Primary Build/drop/ResetInstanceByDomainName.ps1",
"arguments": "-ApiUrl \"$(dynMgmtApiUrl)\" -UserName \"$(dynUserName)\" -Password \"$(dynPassword)\" -BaseLanguage $(dynBaseLanguage) -DomainName \"$(dynDomain)\" -FriendlyName \"$(dynFriendlyName)\" -InitialUserEmail \"$(dynUserName)\" -ServiceVersionId \"$(dynServiceVersionId)\" -InstanceType \"$(dynInstanceType)\"",
"workingFolder": "",
"inlineScript": "# You can write your powershell scripts inline here. \n# You can also pass predefined and custom variables to this scripts using arguments\n\n Write-Host \"Hello World\"",
"failOnStandardError": "true"
"apiUrl": "$(dynMgmtApiUrl)",
"username": "$(dynUserName)",
"password": "$(dynPassword)",
"domainName": "$(dynDomain)",
"friendlyName": "$(dynFriendlyName)",
"purpose": "",
"initialUserEmail": "$(dynUserName)",
"instanceType": "Sandbox",
"serviceVersion": "31cafafe-c6b1-4c0a-bb53-73927841bc5c",
"sales": "false",
"customerService": "false",
"fieldService": "false",
"projectService": "false",
"languageId": "$(dynBaseLanguage)",
"currencyCode": "",
"currencyName": "",
"currencyPrecision": "",
"currencySymbol": "",
"securityGroupId": "",
"securityGroupName": "",
"waitForCompletion": "true",
"sleepDuration": "5"
}
},
{
Expand Down
89 changes: 39 additions & 50 deletions Primary Release - Dynamics Only.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"source": 2,
"id": 3,
"revision": 14,
"revision": 22,
"name": "Primary Release - Dynamics Only",
"description": null,
"createdBy": {
Expand All @@ -19,7 +19,7 @@
"url": "https://app.vssps.visualstudio.com/A23c752fb-0c7e-40ce-b5fc-276e6094b415/_apis/Identities/6582fd44-c7b5-6af6-8054-e8e93761fc9c",
"imageUrl": "https://dkdtdevops.visualstudio.com/_api/_common/identityImage?id=6582fd44-c7b5-6af6-8054-e8e93761fc9c"
},
"modifiedOn": "2017-10-17T02:12:58.997Z",
"modifiedOn": "2017-10-17T23:58:45.427Z",
"path": "\\",
"variables": {
"dynBaseLanguage": {
Expand All @@ -28,9 +28,6 @@
"dynConnectionString": {
"value": "AuthType=Office365;Username=$(dynUserName);Url=$(dynUrl);Password=$(dynPassword)"
},
"dynInstanceType": {
"value": "Sandbox"
},
"dynMgmtApiUrl": {
"value": "https://admin.services.crm.dynamics.com"
},
Expand Down Expand Up @@ -65,9 +62,6 @@
"value": null,
"isSecret": true
},
"dynServiceVersionId": {
"value": "31cafafe-c6b1-4c0a-bb53-73927841bc5c"
},
"dynTenant": {
"value": "yourtenant.onmicrosoft.com"
},
Expand Down Expand Up @@ -135,7 +129,7 @@
"scriptName": "",
"arguments": "",
"workingFolder": "",
"inlineScript": "$env:dateTimeStamp = Get-Date -format 'u'",
"inlineScript": "# Set dateTimeStamp VSTS variable for use by backup instance label\n\n$env:dateTimeStamp = Get-Date -format 'u'\n\n# NOTE: There's an issue with backups using the current \"reset\" approach (delete/provision). See: https://github.com/devkeydet/dyn365-ce-devops/issues/22",
"failOnStandardError": "true"
}
},
Expand Down Expand Up @@ -167,31 +161,10 @@
}
},
{
"taskId": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"version": "1.*",
"name": "Install-Module Microsoft.Xrm.OnlineManagementAPI",
"refName": "ClonedPowerShell11",
"enabled": true,
"alwaysRun": false,
"continueOnError": false,
"timeoutInMinutes": 0,
"definitionType": "task",
"overrideInputs": {},
"condition": "succeeded()",
"inputs": {
"scriptType": "inlineScript",
"scriptName": "",
"arguments": "",
"workingFolder": "",
"inlineScript": "Write-Host \"Installing Microsoft.Xrm.OnlineManagementAPI...\"\n\nInstall-Module Microsoft.Xrm.OnlineManagementAPI -SkipPublisherCheck -Force -Scope CurrentUser",
"failOnStandardError": "true"
}
},
{
"taskId": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"version": "1.*",
"name": "Download Reset Dynamics 365 Instance Script",
"refName": "ClonedPowerShell22",
"taskId": "764581cb-fc00-4969-bb1a-ec39f59b86f7",
"version": "8.*",
"name": "Reset Instance Part I (Delete)",
"refName": "MSCRMDeleteOnlineInstance1",
"enabled": true,
"alwaysRun": false,
"continueOnError": false,
Expand All @@ -200,19 +173,19 @@
"overrideInputs": {},
"condition": "succeeded()",
"inputs": {
"scriptType": "inlineScript",
"scriptName": "",
"arguments": "",
"workingFolder": "$(System.DefaultWorkingDirectory)/Primary Build/drop",
"inlineScript": "# I've asked for tasks to be added to the following VSTS extension:\n# https://github.com/WaelHamze/xrm-ci-framework/issues/46 (vote it up)\n# Until then, this approach will get the job done.\n\n$url = \"https://raw.githubusercontent.com/devkeydet/dyn365-ce-mgmt-api-devops-scripts/1.1/ResetInstanceByDomainName.ps1\"\n$output = \"ResetInstanceByDomainName.ps1\"\nInvoke-WebRequest -Uri $url -OutFile $output",
"failOnStandardError": "true"
"apiUrl": "$(dynMgmtApiUrl)",
"username": "$(dynUserName)",
"Password": "$(dynPassword)",
"instanceName": "$(dynDomain)",
"waitForCompletion": "true",
"sleepDuration": "5"
}
},
{
"taskId": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"version": "1.*",
"name": "Reset Dynamics 365 Instance",
"refName": "ClonedPowerShell13",
"taskId": "75b16512-23b8-49bd-9f31-c56d491207ad",
"version": "8.*",
"name": "Reset Instance Part II (Provision)",
"refName": "MSCRMProvisionOnlineInstance2",
"enabled": true,
"alwaysRun": false,
"continueOnError": false,
Expand All @@ -221,12 +194,28 @@
"overrideInputs": {},
"condition": "succeeded()",
"inputs": {
"scriptType": "filePath",
"scriptName": "$(System.DefaultWorkingDirectory)/Primary Build/drop/ResetInstanceByDomainName.ps1",
"arguments": "-ApiUrl \"$(dynMgmtApiUrl)\" -UserName \"$(dynUserName)\" -Password \"$(dynPassword)\" -BaseLanguage $(dynBaseLanguage) -DomainName \"$(dynDomain)\" -FriendlyName \"$(dynFriendlyName)\" -InitialUserEmail \"$(dynUserName)\" -ServiceVersionId \"$(dynServiceVersionId)\" -InstanceType \"$(dynInstanceType)\"",
"workingFolder": "",
"inlineScript": "# You can write your powershell scripts inline here. \n# You can also pass predefined and custom variables to this scripts using arguments\n\n Write-Host \"Hello World\"",
"failOnStandardError": "true"
"apiUrl": "$(dynMgmtApiUrl)",
"username": "$(dynUserName)",
"password": "$(dynPassword)",
"domainName": "$(dynDomain)",
"friendlyName": "$(dynFriendlyName)",
"purpose": "",
"initialUserEmail": "$(dynUserName)",
"instanceType": "Sandbox",
"serviceVersion": "31cafafe-c6b1-4c0a-bb53-73927841bc5c",
"sales": "false",
"customerService": "false",
"fieldService": "false",
"projectService": "false",
"languageId": "$(dynBaseLanguage)",
"currencyCode": "",
"currencyName": "",
"currencyPrecision": "",
"currencySymbol": "",
"securityGroupId": "",
"securityGroupName": "",
"waitForCompletion": "true",
"sleepDuration": "5"
}
},
{
Expand Down

0 comments on commit f08e84e

Please sign in to comment.