Merge pull request #416 from KTH/stratus-templates

pipeline: migrate stratus-templates
KTH · Jan 9, 2025 · ba3af4a · ba3af4a
2 parents b87bbdd + 1b3290e
commit ba3af4a
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 95 deletions.
diff --git a/.azure/azure-pipelines.pr.yml b/.azure/azure-pipelines.pr.yml
@@ -13,22 +13,30 @@ variables:
 
 resources:
   repositories:
-    - repository: cet-iac
+    - repository: stratus-templates
       type: git
-      name: Cloud Excellence Team/cet-iac
+      name: Cloud Excellence Team/stratus-templates
       ref: main
 
 pool:
   vmImage: 'ubuntu-latest'
 
-steps:
-  - template: templates/test/npm-test.yml@cet-iac
-    parameters:
-      nodeVersion: 18.x
-  - template: templates/test/docker-test.yml@cet-iac
-    parameters:
-      dockerComposeFilePaths:
-        - '$(Pipeline.Workspace)/github/docker-compose-unit-tests.yml'
-      dockerfilePath: $(dockerfilePath)
-      imageName: $(imageName)
-      tag: $(tag)
+extends:
+  template: templates/security/security-scans.yml@stratus-templates
+  parameters:
+    break: false
+    jobs:
+    - job: test
+      displayName: 'Test'
+      steps:
+      - template: /templates/test/npm.yml@stratus-templates
+        parameters:
+          nodeVersion: 18.x
+
+      - template: /templates/test/docker.yml@stratus-templates
+        parameters:
+          dockerComposeFilePaths:
+          - '$(Pipeline.Workspace)/github/docker-compose-unit-tests.yml'
+          dockerfilePath: $(dockerfilePath)
+          imageName: $(imageName)
+          tag: $(tag)
diff --git a/.azure/azure-pipelines.prod.yml b/.azure/azure-pipelines.prod.yml
@@ -8,29 +8,31 @@ parameters:
 
 variables:
   - group: studadm-general-params
-  - group: studadm-spoke1-prod
-  - name: appName
-    value: kurs-pm-web-prod
   - name: imageName
     value: kurs-pm-web
   - name: parametersFileName
     value: prod.parameters.json
 
 resources:
   repositories:
-    - repository: cet-iac
+    - repository: stratus-templates
       type: git
-      name: Cloud Excellence Team/cet-iac
+      name: Cloud Excellence Team/stratus-templates
       ref: main
 
 pool:
   vmImage: 'ubuntu-latest'
 
-steps:
-  - template: templates/app-service/update-image.yml@cet-iac
-    parameters:
-      parametersFileName: $(parametersFileName)
-      appName: $(appName)
-      imageName: $(imageName)
-      tag: ${{ parameters.imageTag }}
-      isApi: false
+extends:
+  template: templates/security/security-scans.yml@stratus-templates
+  parameters:
+    break: false
+    jobs:
+    - job: update
+      displayName: 'Update App Service'
+      steps:
+      - template: /templates/app-service/update-image.yml@stratus-templates
+        parameters:
+          parametersFileName: $(parametersFileName)
+          imageName: $(imageName)
+          tag: ${{ parameters.imageTag }}
diff --git a/.azure/azure-pipelines.ref.yml b/.azure/azure-pipelines.ref.yml
@@ -6,11 +6,8 @@ trigger:
 
 variables:
   - group: studadm-general-params
-  - group: studadm-spoke1-ref
   - name: dockerfilePath
     value: '$(Pipeline.Workspace)/github/Dockerfile'
-  - name: appName
-    value: kurs-pm-web-ref
   - name: imageName
     value: kurs-pm-web
   - name: tag
@@ -20,43 +17,60 @@ variables:
 
 resources:
   repositories:
-    - repository: cet-iac
+    - repository: stratus-templates
       type: git
-      name: Cloud Excellence Team/cet-iac
+      name: Cloud Excellence Team/stratus-templates
       ref: main
 
 pool:
   vmImage: 'ubuntu-latest'
 
-steps:
-  - template: templates/test/npm-test.yml@cet-iac
-    parameters:
-      nodeVersion: 18.x
-  - template: templates/docker/build.yml@cet-iac
-    parameters:
-      runScan: false
-      dockerFilePath: $(dockerfilePath)
-      imageName: $(imageName)
-      tag: $(tag)
+extends:
+  template: templates/security/security-scans.yml@stratus-templates
+  parameters:
+    break: false
+    jobs:
+    - job: test
+      displayName: 'Docker Compose Test'
+      steps:
+      - template: /templates/test/docker.yml@stratus-templates
+        parameters:
+          imageName: $(imageName)
+          dockerfilePath: $(dockerfilePath)
+          tag: $(tag)
+          dockerComposeFilePaths: 
+          - '$(Pipeline.Workspace)/github/docker-compose-unit-tests.yml'
 
-  - template: templates/test/docker-test.yml@cet-iac
-    parameters:
-      imageName: $(imageName)
-      dockerfilePath: $(dockerfilePath)
-      tag: $(tag)
-      dockerComposeFilePaths:
-        - '$(Pipeline.Workspace)/github/docker-compose-unit-tests.yml'
+    - job: sonarqube
+      displayName: 'SonarQube and NPM Test'
+      steps:
+      - template: /templates/codescan/sonarqube.yml@stratus-templates
+        parameters:
+          projectName: $(imageName)
+          steps:
+          - template: /templates/test/npm.yml@stratus-templates
+            parameters:
+              nodeVersion: 18.x
 
-  - template: templates/docker/push.yml@cet-iac
-    parameters:
-      dockerFilePath: $(dockerfilePath)
-      imageName: $(imageName)
-      tag: $(tag)
+    - job: build_push
+      dependsOn: sonarqube
+      displayName: 'Build and Push image'
+      steps:
+      - template: /templates/docker/push.yml@stratus-templates
+        parameters:
+          build: true
+          break: false
+          dockerFilePath: $(dockerfilePath)
+          imageName: $(imageName)
+          tag: $(tag)
 
-  - template: templates/app-service/update-image.yml@cet-iac
-    parameters:
-      parametersFileName: $(parametersFileName)
-      appName: $(appName)
-      imageName: $(imageName)
-      tag: $(tag)
-      isApi: false
+    - job: update
+      dependsOn:
+      - build_push
+      displayName: 'Update App Service'
+      steps:
+      - template: /templates/app-service/update-image.yml@stratus-templates
+        parameters:
+          parametersFileName: $(parametersFileName)
+          imageName: $(imageName)
+          tag: $(tag)
diff --git a/.azure/deploy-infra.yml b/.azure/deploy-infra.yml
diff --git a/.azure/prod.parameters.json b/.azure/prod.parameters.json
@@ -3,7 +3,10 @@
   "contentVersion": "1.0.0.0",
   "parameters": {
     "appName": {
-      "value": "kurs-pm-web-prod"
+      "value": "kurs-pm-web"
+    },
+    "env": {
+      "value": "prod"
     },
     "secretNames": {
       "value": [

diff --git a/.azure/ref.parameters.json b/.azure/ref.parameters.json
@@ -3,7 +3,10 @@
   "contentVersion": "1.0.0.0",
   "parameters": {
     "appName": {
-      "value": "kurs-pm-web-ref"
+      "value": "kurs-pm-web"
+    },
+    "env": {
+      "value": "ref"
     },
     "secretNames": {
       "value": [