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.

Sign up for GitHub

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

Fix the skill bot functional test pipelines #117

Merged
merged 12 commits into from
Jun 29, 2020
Merged

Fix the skill bot functional test pipelines #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
056841c
Add az group create
Jun 27, 2020
900e214
Switch to az deployment group create
Jun 27, 2020
73290e7
Fix az deployment group create arg
Jun 27, 2020
0a4b5cf
Use arg existingAppServicePlan
Jun 27, 2020
ea64ea7
Fill in all args
Jun 27, 2020
b71958c
Zero out arg existingAppServicePlan
Jun 27, 2020
c21bae9
Fix js Create resource group task
Jun 27, 2020
e0749fd
Remove arg for js az deployment group create
Jun 27, 2020
0e6adc1
Replace "...new..." with "template-with-preexisting-rg.json"
Jun 27, 2020
30a8f87
Revert for v3 builds
Jun 27, 2020
2d38730
Update python deploy steps
Jun 27, 2020
57bfd93
Update Py pipelines
Jun 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/yaml/dotnetDeploySteps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ steps:
azureSubscription: $(AzureSubscription)
scriptLocation: inlineScript
inlineScript: |
call az deployment create --name $(BotName) --template-file "$(TemplateLocation)" --location "westus" --parameters appId="$(DeployAppId)" appSecret="$(DeployAppSecret)" botId="$(BotName)" botSku=F0 newAppServicePlanName="$(BotName)" newWebAppName="$(BotName)-$(Build.BuildId)" groupName="$(BotName)-RG" groupLocation="westus" newAppServicePlanLocation="westus"
call az group create --location westus --name "$(BotName)-RG"
call az deployment group create --resource-group "$(BotName)-RG" --name $(BotName) --template-file "$(TemplateLocation)" --parameters appId="$(DeployAppId)" appSecret="$(DeployAppSecret)" botId="$(BotName)" botSku=F0 newAppServicePlanName="$(BotName)" appServicePlanLocation="westus" existingAppServicePlan="" existingAppServicePlanResourceGroup="$(BotName)-RG" newWebAppName="$(BotName)-$(Build.BuildId)"

- task: AzureCLI@1
displayName: 'Deploy bot'
Expand Down
4 changes: 2 additions & 2 deletions build/yaml/dotnetHost2JavascriptSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.project: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/SimpleHostBot.csproj'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: dotnetSetConfigFileSteps.yml
- template: dotnetDeploySteps.yml
Expand All @@ -99,7 +99,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.sourceLocation: 'SkillsFunctionalTests/javascript/skill'
TemplateLocation: 'SkillsFunctionalTests/javascript/skill/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/javascript/skill/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: javascriptDeploySteps.yml

Expand Down
4 changes: 2 additions & 2 deletions build/yaml/dotnetHost2PythonSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.project: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/SimpleHostBot.csproj'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: dotnetSetConfigFileSteps.yml
- template: dotnetDeploySteps.yml
Expand All @@ -101,7 +101,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.sourceLocation: 'SkillsFunctionalTests/python/skill'
TemplateLocation: 'SkillsFunctionalTests/python/skill/deploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/python/skill/deploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: pythonDeploySteps.yml

Expand Down
4 changes: 2 additions & 2 deletions build/yaml/dotnetHost2dotnetSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.project: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/SimpleHostBot.csproj'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionHost)/host/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: dotnetSetConfigFileSteps.yml
- template: dotnetDeploySteps.yml
Expand All @@ -117,7 +117,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.project: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/EchoSkillBot.csproj'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: dotnetDeploySteps.yml

Expand Down
3 changes: 2 additions & 1 deletion build/yaml/javascriptDeploySteps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ steps:
azureSubscription: $(AzureSubscription)
scriptLocation: inlineScript
inlineScript: |
call az deployment create --name "$(BotName)-RG" --template-file "$(TemplateLocation)" --location "westus" --parameters appId="$(DeployAppId)" appSecret="$(DeployAppSecret)" botId="$(BotName)" botSku=F0 newAppServicePlanName="$(BotName)" newWebAppName="$(BotName)-$(Build.BuildId)" groupName="$(BotName)-RG" groupLocation="westus" newAppServicePlanLocation="westus"
call az group create --location westus --name "$(BotName)-RG"
call az deployment group create --resource-group "$(BotName)-RG" --name $(BotName) --template-file "$(TemplateLocation)" --parameters appId="$(DeployAppId)" appSecret="$(DeployAppSecret)" botId="$(BotName)" botSku=F0 newAppServicePlanName="$(BotName)" appServicePlanLocation="westus" existingAppServicePlan="" newWebAppName="$(BotName)-$(Build.BuildId)"

- task: AzureCLI@1
displayName: 'Deploy bot'
Expand Down
4 changes: 2 additions & 2 deletions build/yaml/javascriptHost2DotnetSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.sourceLocation: 'SkillsFunctionalTests/javascript/host'
TemplateLocation: 'SkillsFunctionalTests/javascript/host/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/javascript/host/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: javascriptSetConfigFileSteps.yml
- template: javascriptDeploySteps.yml
Expand All @@ -99,7 +99,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.project: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/EchoSkillBot.csproj'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: dotnetDeploySteps.yml

Expand Down
4 changes: 2 additions & 2 deletions build/yaml/javascriptHost2JavascriptSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.sourceLocation: 'SkillsFunctionalTests/javascript/host'
TemplateLocation: 'SkillsFunctionalTests/javascript/host/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/javascript/host/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: javascriptSetConfigFileSteps.yml
- template: javascriptDeploySteps.yml
Expand All @@ -83,7 +83,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.sourceLocation: 'SkillsFunctionalTests/javascript/skill'
TemplateLocation: 'SkillsFunctionalTests/javascript/skill/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/javascript/skill/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: javascriptDeploySteps.yml

Expand Down
4 changes: 2 additions & 2 deletions build/yaml/javascriptHost2PythonSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.sourceLocation: 'SkillsFunctionalTests/javascript/host'
TemplateLocation: 'SkillsFunctionalTests/javascript/host/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/javascript/host/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: javascriptSetConfigFileSteps.yml
- template: javascriptDeploySteps.yml
Expand All @@ -85,7 +85,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.sourceLocation: 'SkillsFunctionalTests/python/skill'
TemplateLocation: 'SkillsFunctionalTests/python/skill/deploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/python/skill/deploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: pythonDeploySteps.yml

Expand Down
3 changes: 2 additions & 1 deletion build/yaml/pythonDeploySteps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ steps:
azureSubscription: $(AzureSubscription)
scriptLocation: inlineScript
inlineScript: |
az deployment create --name "$(BotName)-RG" --template-file "$(System.DefaultWorkingDirectory)/$(TemplateLocation)" --location "westus" --parameters appId="$(DeployAppId)" appSecret="$(DeployAppSecret)" botId="$(BotName)" botSku=F0 newAppServicePlanName="$(BotName)" newWebAppName="$(BotName)-$(Build.BuildId)" groupName="$(BotName)-RG" groupLocation="westus" newAppServicePlanLocation="westus"
call az group create --location westus --name "$(BotName)-RG"
call az deployment group create --resource-group "$(BotName)-RG" --name $(BotName) --template-file "$(TemplateLocation)" --parameters appId="$(DeployAppId)" appSecret="$(DeployAppSecret)" botId="$(BotName)" botSku=F0 newAppServicePlanName="$(BotName)" appServicePlanLocation="westus" existingAppServicePlan="" newWebAppName="$(BotName)-$(Build.BuildId)"

- script: |
git config --global user.name "GitPythonDeploymentUser"
Expand Down
4 changes: 2 additions & 2 deletions build/yaml/pythonHost2DotnetSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.sourceLocation: 'SkillsFunctionalTests/python/host'
TemplateLocation: 'SkillsFunctionalTests/python/host/deploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/python/host/deploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: pythonSetConfigFileSteps.yml
- template: pythonDeploySteps.yml
Expand All @@ -101,7 +101,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.project: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/EchoSkillBot.csproj'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/dotnet/$(NetCoreSdkVersionSkill)/skill/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: dotnetDeploySteps.yml

Expand Down
4 changes: 2 additions & 2 deletions build/yaml/pythonHost2JavascriptSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.sourceLocation: 'SkillsFunctionalTests/python/host'
TemplateLocation: 'SkillsFunctionalTests/python/host/deploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/python/host/deploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: pythonSetConfigFileSteps.yml
- template: pythonDeploySteps.yml
Expand All @@ -86,7 +86,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.sourceLocation: 'SkillsFunctionalTests/javascript/skill'
TemplateLocation: 'SkillsFunctionalTests/javascript/skill/DeploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/javascript/skill/DeploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: javascriptDeploySteps.yml

Expand Down
4 changes: 2 additions & 2 deletions build/yaml/pythonHost2PythonSkill.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ stages:
Registry: $[variables.RegistryUrlHost]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionHost]
Parameters.sourceLocation: 'SkillsFunctionalTests/python/host'
TemplateLocation: 'SkillsFunctionalTests/python/host/deploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/python/host/deploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: pythonSetConfigFileSteps.yml
- template: pythonDeploySteps.yml
Expand All @@ -85,7 +85,7 @@ stages:
Registry: $[variables.RegistryUrlSkill]
BotBuilderPackageVersion: $[variables.BotBuilderPackageVersionSkill]
Parameters.sourceLocation: 'SkillsFunctionalTests/python/skill'
TemplateLocation: 'SkillsFunctionalTests/python/skill/deploymentTemplates/template-with-new-rg.json'
TemplateLocation: 'SkillsFunctionalTests/python/skill/deploymentTemplates/template-with-preexisting-rg.json'
steps:
- template: pythonDeploySteps.yml

Expand Down