From 2a2079dfcc9ac6fe4a81719e0f1044539e339027 Mon Sep 17 00:00:00 2001 From: Wesley Camargo Date: Sun, 24 Jul 2022 16:42:16 +0200 Subject: [PATCH] Implemented example for app service (#3) Implemented example for app service (#3) --- .../appService/appService-build-jobs.yml | 6 +-- .../appService/appService-deploy-jobs.yml | 40 +++++++++---------- .../appService/examples/azure-pipelines.yml | 16 ++++++-- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/src/cloud/azure/appService/appService-build-jobs.yml b/src/cloud/azure/appService/appService-build-jobs.yml index f465841..4ce9b82 100644 --- a/src/cloud/azure/appService/appService-build-jobs.yml +++ b/src/cloud/azure/appService/appService-build-jobs.yml @@ -14,6 +14,6 @@ jobs: - task: PublishPipelineArtifact@1 inputs: - targetPath: '$(build.artifactstagingdirectory)' - artifact: ${{ parameters.resource.runName }} - publishLocation: 'pipeline' \ No newline at end of file + targetPath: $(build.artifactstagingdirectory) + artifact: ${{ parameters.resource.name }} + publishLocation: pipeline \ No newline at end of file diff --git a/src/cloud/azure/appService/appService-deploy-jobs.yml b/src/cloud/azure/appService/appService-deploy-jobs.yml index d614338..dd377c7 100644 --- a/src/cloud/azure/appService/appService-deploy-jobs.yml +++ b/src/cloud/azure/appService/appService-deploy-jobs.yml @@ -6,7 +6,6 @@ parameters: - name: environment type: string - jobs: - ${{ if and(eq(parameters.settings.deploy.infrastructure.enabled, 'true'), eq(parameters.resource.deploy.infrastructure.enabled, 'true')) }}: @@ -19,7 +18,6 @@ jobs: runOnce: deploy: steps: - - task: AzureResourceManagerTemplateDeployment@3 displayName: Creating App Service '${{ parameters.resource.name }}' by IaC inputs: @@ -29,32 +27,32 @@ jobs: resourceGroupName: ${{ parameters.settings.azure.resourceGroup.name }} location: ${{ parameters.settings.azure.resourceGroup.location }} templateLocation: 'Linked artifact' - csmFile: '$(Pipeline.Workspace)/${{ parameters.resource.runName }}/infrastructure/appService.json' + csmFile: '$(Pipeline.Workspace)/${{ parameters.resource.name }}/infrastructure/appService.json' overrideParameters: > -servicePlanName ${{ parameters.resource.deploy.infrastructure.servicePlanName }} -siteName ${{ parameters.resource.name }} deploymentMode: 'Incremental' deploymentOutputs: 'ArmOutputs' - - ${{ if and(eq(parameters.settings.deploy.application.enabled, 'true'),eq(parameters.resource.deploy.application.enabled, 'true')) }}: - - deployment: - displayName: App - Azure App Service Deployment - environment: ${{ parameters.environment }} - ${{ if and(eq(parameters.settings.deploy.infrastructure.enabled, 'true'), eq(parameters.resource.deploy.infrastructure.enabled, 'true')) }}: - dependsOn: ${{ replace(parameters.resource.runName,'-','') }}iac - ${{ else }}: - dependsOn: resourceGroupDeploy - strategy: - runOnce: - deploy: - steps: +# - ${{ if and(eq(parameters.settings.deploy.application.enabled, 'true'),eq(parameters.resource.deploy.application.enabled, 'true')) }}: +# - deployment: +# displayName: App - Azure App Service Deployment +# environment: ${{ parameters.environment }} +# ${{ if and(eq(parameters.settings.deploy.infrastructure.enabled, 'true'), eq(parameters.resource.deploy.infrastructure.enabled, 'true')) }}: +# dependsOn: ${{ replace(parameters.resource.runName,'-','') }}iac +# ${{ else }}: +# dependsOn: resourceGroupDeploy +# strategy: +# runOnce: +# deploy: +# steps: - - ${{ if ne( parameters.resource.type, 'appService') }}: - - task: AzureWebApp@1 - inputs: - azureSubscription: ${{ parameters.settings.azure.subscription.serviceConnection }} - appName: ${{ parameters.resource.name }} - package: $(Pipeline.Workspace)/${{ parameters.resource.runName }}/**/*.zip +# - ${{ if ne( parameters.resource.type, 'appService') }}: +# - task: AzureWebApp@1 +# inputs: +# azureSubscription: ${{ parameters.settings.azure.subscription.serviceConnection }} +# appName: ${{ parameters.resource.name }} +# package: $(Pipeline.Workspace)/${{ parameters.resource.runName }}/**/*.zip # - deployment: # displayName: Azure App Service Deployment diff --git a/src/cloud/azure/appService/examples/azure-pipelines.yml b/src/cloud/azure/appService/examples/azure-pipelines.yml index 53038ad..95f1553 100644 --- a/src/cloud/azure/appService/examples/azure-pipelines.yml +++ b/src/cloud/azure/appService/examples/azure-pipelines.yml @@ -1,3 +1,11 @@ +resources: + repositories: + - repository: ReleaseEngine + type: github + endpoint: devopsnights + name: devopsnights/AzureDevOpsReleaseEngine + ref: refs/heads/feature/appService + trigger: branches: include: @@ -12,14 +20,14 @@ pool: # name: default extends: - template: ../../../../main.yml + template: /src/main.yml parameters: settings: build: enabled: true deploy: enabled: true - variablesDirectory: ./cloud/azure/appService/examples/variables + variablesDirectory: /src/cloud/azure/appService/examples/variables infrastructure: enabled: true application: @@ -37,7 +45,7 @@ extends: # - uat # - prd resources: - - name: $(appServiceName) + - name: example-appService-iac type: appService enabled: true deploy: @@ -45,4 +53,4 @@ extends: enabled: true servicePlanName: $(servicePlanName) application: - enabled: false \ No newline at end of file + enabled: false