10hr

Altinn · Feb 28, 2025 · 74a7329 · 74a7329
1 parent 7b80aa8
commit 74a7329
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 2 deletions.
diff --git a/.azure/applications/web-api-migration-job/main.bicep b/.azure/applications/web-api-migration-job/main.bicep
@@ -22,6 +22,9 @@ param containerAppEnvironmentName string
 @secure()
 param environmentKeyVaultName string
 
+@description('The replica timeout for the job in seconds')
+param replicaTimeOutInSeconds int
+
 var namePrefix = 'dp-be-${environment}'
 var baseImageUrl = 'ghcr.io/altinn/dialogporten-'
 var tags = {
@@ -73,6 +76,7 @@ module migrationJob '../../modules/containerAppJob/main.bicep' = {
     secrets: secrets
     tags: tags
     userAssignedIdentityId: managedIdentity.id
+    replicaTimeOutInSeconds: replicaTimeOutInSeconds
   }
 }
 

diff --git a/.azure/applications/web-api-migration-job/prod.bicepparam b/.azure/applications/web-api-migration-job/prod.bicepparam
@@ -3,6 +3,7 @@ using './main.bicep'
 param environment = 'prod'
 param location = 'norwayeast'
 param imageTag = readEnvironmentVariable('IMAGE_TAG')
+param replicaTimeOutInSeconds = 36000
 
 //secrets
 param containerAppEnvironmentName = readEnvironmentVariable('AZURE_CONTAINER_APP_ENVIRONMENT_NAME')

diff --git a/.azure/applications/web-api-migration-job/staging.bicepparam b/.azure/applications/web-api-migration-job/staging.bicepparam
@@ -3,6 +3,7 @@ using './main.bicep'
 param environment = 'staging'
 param location = 'norwayeast'
 param imageTag = readEnvironmentVariable('IMAGE_TAG')
+param replicaTimeOutInSeconds = 36000
 
 //secrets
 param containerAppEnvironmentName = readEnvironmentVariable('AZURE_CONTAINER_APP_ENVIRONMENT_NAME')

diff --git a/.azure/applications/web-api-migration-job/test.bicepparam b/.azure/applications/web-api-migration-job/test.bicepparam
@@ -3,6 +3,7 @@ using './main.bicep'
 param environment = 'test'
 param location = 'norwayeast'
 param imageTag = readEnvironmentVariable('IMAGE_TAG')
+param replicaTimeOutInSeconds = 36000
 
 //secrets
 param containerAppEnvironmentName = readEnvironmentVariable('AZURE_CONTAINER_APP_ENVIRONMENT_NAME')

diff --git a/.azure/applications/web-api-migration-job/yt01.bicepparam b/.azure/applications/web-api-migration-job/yt01.bicepparam
@@ -3,6 +3,7 @@ using './main.bicep'
 param environment = 'yt01'
 param location = 'norwayeast'
 param imageTag = readEnvironmentVariable('IMAGE_TAG')
+param replicaTimeOutInSeconds = 36000
 
 //secrets
 param containerAppEnvironmentName = readEnvironmentVariable('AZURE_CONTAINER_APP_ENVIRONMENT_NAME')

diff --git a/.azure/modules/containerAppJob/main.bicep b/.azure/modules/containerAppJob/main.bicep
@@ -29,6 +29,9 @@ param args string = ''
 @minLength(1)
 param userAssignedIdentityId string
 
+@description('The replica timeout for the job in seconds')
+param replicaTimeOutInSeconds int
+
 var isScheduled = !empty(cronExpression)
 
 var scheduledJobProperties = {
@@ -64,7 +67,7 @@ resource job 'Microsoft.App/jobs@2024-03-01' = {
       {
         secrets: secrets
         replicaRetryLimit: 1
-        replicaTimeout: 120
+        replicaTimeout: replicaTimeOutInSeconds
       },
       isScheduled ? scheduledJobProperties : manualJobProperties
     )

diff --git a/...Domain.Dialogporten.Infrastructure/Persistence/Migrations/DialogDbContextModelSnapshot.cs b/...Domain.Dialogporten.Infrastructure/Persistence/Migrations/DialogDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated /> 
 using System;
 using Digdir.Domain.Dialogporten.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;