Merge pull request #4 from pagopa/fix-deploy

Fix deploy
pagopa · Apr 28, 2023 · 6b84b7f · 6b84b7f
2 parents 6c08cb6 + b486081
commit 6b84b7f
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 20 deletions.
diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml
@@ -57,14 +57,11 @@ variables:
     dockerRegistryServiceConnection: $(PROD_CONTAINER_REGISTRY_SERVICE_CONN)
     dockerNamespace: $(PROD_CONTAINER_NAMESPACE)
 
-
   ${{ if eq(variables['Build.SourceBranchName'], 'merge') }}:
     SOURCE_BRANCH: "main" # force to main branch
   ${{ if ne(variables['Build.SourceBranchName'], 'merge') }}:
     SOURCE_BRANCH: ${{ variables['Build.SourceBranchName'] }}
 
-
-
   MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
   MAVEN_OPTS: "-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)"
   title: ""
@@ -100,7 +97,7 @@ stages:
           - ${{ if ne(parameters.SEMVER, 'skip') }}:
               - template: templates/maven-github-release/template.yaml@pagopaCommons
                 parameters:
-                  release_branch: $(sourceBranch)
+                  release_branch: $(SOURCE_BRANCH)
                   gitEmail: $(GIT_EMAIL)
                   gitUsername: $(GIT_USERNAME)
                   gitHubConnection: $(GITHUB_CONNECTION)
@@ -173,17 +170,46 @@ stages:
               slotName: production
               resourceGroupName: $(RESOURCE_GROUP)
           - task: AzureFunctionAppContainer@1
-            displayName: Deploy Function App [PROD]
+            displayName: Deploy Function App [PROD] staging
             condition: eq('${{ parameters.ENV }}', 'prod')
             inputs:
               azureSubscription: $(AZURE_SUBSCRIPTION)
-              appName: "${{variables.APP_NAME}}-fn-${{replace(variables.imageRepository, 'reporting', 'gpd')}}"
+              appName: "${{variables.APP_NAME}}-fn-gpd-batch"
               imageName: "${{variables.dockerNamespace}}/${{ variables.imageRepository }}:latest"
               deployToSlotOrASE: true
               slotName: staging
               resourceGroupName: $(RESOURCE_GROUP)
 
-
           - script: |
               echo "##vso[task.setvariable variable=version;isOutput=true]$(pomversion.next)"
-            name: dockerTag
+            name: dockerTag
+  - stage: deployApprovalPROD
+    condition: eq('${{ parameters.ENV }}', 'prod')
+    dependsOn: deploy
+    pool:
+      vmImage: "ubuntu-latest"
+    jobs:
+      - job: waitForApprovalPROD
+        displayName: waiting for approval
+        pool: server
+        timeoutInMinutes: 4320 # 3 days
+        steps:
+          - task: ManualValidation@0
+            displayName: Manual Approval
+            inputs:
+              onTimeout: "reject"
+
+      - job: completeProdDeployFn
+        displayName: complete prod function deploy
+        dependsOn: waitForApprovalPROD
+        steps:
+          # deploy functions - swap
+          - task: AzureAppServiceManage@0
+            displayName: Swapping App Service Deploy
+            inputs:
+              ConnectedServiceName: $(AZURE_SUBSCRIPTION)
+              WebAppName: "${{variables.APP_NAME}}-fn-gpd-batch"
+              ResourceGroupName: $(RESOURCE_GROUP)
+              SourceSlot: staging
+              SwapWithProduction: true
+              Slot: production
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-functions-template
 description: Microservice description
 type: application
-version: 0.0.1
-appVersion: 0.0.1
+version: 0.1.0-1
+appVersion: 0.1.0-1
 dependencies:
   - name: microservice-chart
     version: 1.21.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -3,8 +3,8 @@ microservice-chart:
   nameOverride: ""
   fullnameOverride: ""
   image:
-    repository: pagopadcommonacr.azurecr.io/pagopa<project-name>  # TODO
-    tag: "0.0.1"
+    repository: pagopadcommonacr.azurecr.io/pagopa<project-name> # TODO
+    tag: "0.1.0-1"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:
@@ -29,7 +29,7 @@ microservice-chart:
     port: 80
   ingress:
     create: true
-    host: "weudev.<namespace>.internal.dev.platform.pagopa.it"  # TODO
+    host: "weudev.<namespace>.internal.dev.platform.pagopa.it" # TODO
     path: /pagopa-<project-name>-service/(.*) # TODO
   serviceAccount:
     create: false

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -3,8 +3,8 @@ microservice-chart:
   nameOverride: ""
   fullnameOverride: ""
   image:
-    repository: pagopapcommonacr.azurecr.io/pagopa<project-name>  # TODO
-    tag: "0.0.1"
+    repository: pagopapcommonacr.azurecr.io/pagopa<project-name> # TODO
+    tag: "0.1.0-1"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:
@@ -29,7 +29,7 @@ microservice-chart:
     port: 80
   ingress:
     create: true
-    host: "weuprod.<namespace>.internal.platform.pagopa.it"  # TODO
+    host: "weuprod.<namespace>.internal.platform.pagopa.it" # TODO
     path: /pagopa-<project-name>-service/(.*) # TODO
   serviceAccount:
     create: false

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -3,8 +3,8 @@ microservice-chart:
   nameOverride: ""
   fullnameOverride: ""
   image:
-    repository: pagopaucommonacr.azurecr.io/pagopa<project-name>  # TODO
-    tag: "0.0.1"
+    repository: pagopaucommonacr.azurecr.io/pagopa<project-name> # TODO
+    tag: "0.1.0-1"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:
@@ -29,7 +29,7 @@ microservice-chart:
     port: 80
   ingress:
     create: true
-    host: "weuuat.<namespace>.internal.uat.platform.pagopa.it"  # TODO
+    host: "weuuat.<namespace>.internal.uat.platform.pagopa.it" # TODO
     path: /pagopa-<project-name>-service/(.*) # TODO
   serviceAccount:
     create: false

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>it.gov.pagopa.reporting</groupId>
     <artifactId>reporting-batch</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.0-1</version>
     <packaging>jar</packaging>
 
     <name>Azure Reporting-Batch Fn</name>