From bd9164546b38bbc517674ca21eef09699e8fbd6a Mon Sep 17 00:00:00 2001 From: AngeloCaporaso Date: Thu, 27 Apr 2023 16:25:14 +0200 Subject: [PATCH 1/4] [PAGOPA-695] fix deploy --- .devops/deploy-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml index fd68b86..f51ecef 100644 --- a/.devops/deploy-pipelines.yml +++ b/.devops/deploy-pipelines.yml @@ -177,7 +177,7 @@ stages: 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 From aabc732cd061f307a442ca177249255499f41f7d Mon Sep 17 00:00:00 2001 From: AngeloCaporaso Date: Fri, 28 Apr 2023 09:50:14 +0200 Subject: [PATCH 2/4] [PAGOPA-695] fix make_release job --- .devops/deploy-pipelines.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml index f51ecef..54712fc 100644 --- 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,7 +170,7 @@ 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) @@ -183,7 +180,6 @@ stages: slotName: staging resourceGroupName: $(RESOURCE_GROUP) - - script: | echo "##vso[task.setvariable variable=version;isOutput=true]$(pomversion.next)" name: dockerTag \ No newline at end of file From aa2f1c947d3eace1a1bc7530f7d1329c0292b0bf Mon Sep 17 00:00:00 2001 From: AngeloCaporaso Date: Fri, 28 Apr 2023 10:04:20 +0200 Subject: [PATCH 3/4] [PAGOPA-695] add deploy approval stage --- .devops/deploy-pipelines.yml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml index 54712fc..62f2eb7 100644 --- a/.devops/deploy-pipelines.yml +++ b/.devops/deploy-pipelines.yml @@ -182,4 +182,34 @@ stages: - script: | echo "##vso[task.setvariable variable=version;isOutput=true]$(pomversion.next)" - name: dockerTag \ No newline at end of file + 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 \ No newline at end of file From b486081515146a4da5428c65289cc483291382f3 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot <> Date: Fri, 28 Apr 2023 08:13:45 +0000 Subject: [PATCH 4/4] Bump version [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 6 +++--- helm/values-prod.yaml | 6 +++--- helm/values-uat.yaml | 6 +++--- pom.xml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index b69df2e..e963b27 100644 --- 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 index a39b257..c32be5a 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -3,8 +3,8 @@ microservice-chart: nameOverride: "" fullnameOverride: "" image: - repository: pagopadcommonacr.azurecr.io/pagopa # TODO - tag: "0.0.1" + repository: pagopadcommonacr.azurecr.io/pagopa # 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..internal.dev.platform.pagopa.it" # TODO + host: "weudev..internal.dev.platform.pagopa.it" # TODO path: /pagopa--service/(.*) # TODO serviceAccount: create: false diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 83842f0..001de57 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -3,8 +3,8 @@ microservice-chart: nameOverride: "" fullnameOverride: "" image: - repository: pagopapcommonacr.azurecr.io/pagopa # TODO - tag: "0.0.1" + repository: pagopapcommonacr.azurecr.io/pagopa # 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..internal.platform.pagopa.it" # TODO + host: "weuprod..internal.platform.pagopa.it" # TODO path: /pagopa--service/(.*) # TODO serviceAccount: create: false diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 1a380e5..f5b6eb3 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -3,8 +3,8 @@ microservice-chart: nameOverride: "" fullnameOverride: "" image: - repository: pagopaucommonacr.azurecr.io/pagopa # TODO - tag: "0.0.1" + repository: pagopaucommonacr.azurecr.io/pagopa # 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..internal.uat.platform.pagopa.it" # TODO + host: "weuuat..internal.uat.platform.pagopa.it" # TODO path: /pagopa--service/(.*) # TODO serviceAccount: create: false diff --git a/pom.xml b/pom.xml index d386e5f..e36ae97 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ it.gov.pagopa.reporting reporting-batch - 0.1.0 + 0.1.0-1 jar Azure Reporting-Batch Fn