Merge branch 'MIJN-6522-fat-rvv' of https://github.com/Amsterdam/mijn…

…-amsterdam-frontend into MIJN-6522-fat-rvv
Amsterdam · Nov 3, 2023 · dec4dee · dec4dee
2 parents 1a013ff + 1a38cee
commit dec4dee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/azure-pipeline-bff.yaml b/azure-pipeline-bff.yaml
@@ -4,6 +4,7 @@ trigger:
     include:
       - ontwikkelen
       - testen
+      - main
   paths:
     include:
       - src/server
@@ -56,6 +57,9 @@ variables:
   - ${{ if or(eq(variables['Build.SourceBranchName'], 'testen'), eq(variables['Build.Reason'], 'PullRequest')) }}:
       - name: dtapName
         value: t
+  - ${{ if eq(variables['Build.SourceBranchName'], 'az-acceptance') }}:
+      - name: dtapName
+        value: a
   - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
       - name: btdDeploy
         value: false

diff --git a/azure-pipeline-ui.yaml b/azure-pipeline-ui.yaml
@@ -4,6 +4,7 @@ trigger:
     include:
       - ontwikkelen
       - testen
+      - main
   paths:
     include:
       - src/client
@@ -58,6 +59,9 @@ variables:
   - ${{ if or(eq(variables['Build.SourceBranchName'], 'testen'), eq(variables['Build.Reason'], 'PullRequest')) }}:
       - name: dtapName
         value: t
+  - ${{ if eq(variables['Build.SourceBranchName'], 'az-acceptance') }}:
+      - name: dtapName
+        value: a
   - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
       - name: btdDeploy
         value: false

diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
@@ -26,8 +26,8 @@ parameters:
       - none
       - o
       - t
-      # - a
-      # - p
+      - a
+      - p
 
   - name: updateAppSettings
     type: boolean
@@ -47,6 +47,9 @@ variables:
   - ${{ if and(or(eq(variables['Build.SourceBranchName'], 'testen'), eq(variables['Build.Reason'], 'PullRequest')), eq(parameters.dtapName, 'none')) }}:
       - name: dtapName
         value: t
+  - ${{ if and(eq(variables['Build.SourceBranchName'], 'az-acceptance'), eq(parameters.dtapName, 'none')) }}:
+      - name: dtapName
+        value: a
   - ${{ if ne(parameters.dtapName, 'none') }}:
       - name: dtapName
         value: ${{ parameters.dtapName }}