Skip to content

Commit d222a10

Browse files
authored
Merge pull request #104 from KTH/stratus-templates
pipeline: migrate to stratus-templates
2 parents 99a78eb + 173296f commit d222a10

File tree

5 files changed

+75
-103
lines changed

5 files changed

+75
-103
lines changed

.azure/azure-pipelines.pr.yml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,31 @@ variables:
1313

1414
resources:
1515
repositories:
16-
- repository: cet-iac
16+
- repository: stratus-templates
1717
type: git
18-
name: Cloud Excellence Team/cet-iac
18+
name: Cloud Excellence Team/stratus-templates
1919
ref: main
2020

2121
pool:
2222
vmImage: 'ubuntu-latest'
2323

24-
jobs:
25-
- job: unit_test
26-
steps:
27-
- template: templates/test/npm-test.yml@cet-iac
28-
parameters:
29-
nodeVersion: 18
30-
31-
- job: integration_test
32-
steps:
33-
- template: templates/test/docker-test.yml@cet-iac
34-
parameters:
35-
dockerComposeFilePaths:
36-
- '$(Pipeline.Workspace)/github/docker-compose-integration-tests.yml'
37-
dockerfilePath: $(dockerfilePath)
38-
imageName: $(imageName)
39-
tag: $(tag)
24+
extends:
25+
template: templates/security/security-scans.yml@stratus-templates
26+
parameters:
27+
break: false
28+
jobs:
29+
- job: unit_test
30+
steps:
31+
- template: /templates/test/npm.yml@stratus-templates
32+
parameters:
33+
nodeVersion: 18
34+
35+
- job: integration_test
36+
steps:
37+
- template: /templates/test/docker.yml@stratus-templates
38+
parameters:
39+
dockerComposeFilePaths:
40+
- '$(Pipeline.Workspace)/github/docker-compose-integration-tests.yml'
41+
dockerfilePath: $(dockerfilePath)
42+
imageName: $(imageName)
43+
tag: $(tag)

.azure/azure-pipelines.ref.yml

Lines changed: 45 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ trigger:
66

77
variables:
88
- group: team-webb-general-params
9-
- group: webb-spoke1-ref
109
- name: dockerfilePath
1110
value: '$(Pipeline.Workspace)/github/Dockerfile'
12-
- name: appName
13-
value: node-api-ref
1411
- name: imageName
1512
value: node-api
1613
- name: tag
@@ -20,61 +17,58 @@ variables:
2017

2118
resources:
2219
repositories:
23-
- repository: cet-iac
20+
- repository: stratus-templates
2421
type: git
25-
name: Cloud Excellence Team/cet-iac
22+
name: Cloud Excellence Team/stratus-templates
2623
ref: main
2724

2825
pool:
2926
vmImage: 'ubuntu-latest'
3027

31-
stages:
32-
- stage: build_test
33-
displayName: Build and test
28+
extends:
29+
template: templates/security/security-scans.yml@stratus-templates
30+
parameters:
31+
break: false
32+
stages:
33+
- stage: build_test
34+
displayName: Build and test
3435

35-
jobs:
36-
- job: unit_test
37-
steps:
38-
- template: templates/test/npm-test.yml@cet-iac
39-
parameters:
40-
nodeVersion: 18
36+
jobs:
37+
- job: unit_test
38+
steps:
39+
- template: /templates/test/npm.yml@stratus-templates
40+
parameters:
41+
nodeVersion: 18
4142

42-
- job: integration_test
43-
dependsOn: unit_test
44-
steps:
45-
- template: templates/test/docker-test.yml@cet-iac
46-
parameters:
47-
imageName: $(imageName)
48-
dockerfilePath: $(dockerfilePath)
49-
tag: $(tag)
50-
dockerComposeFilePaths:
51-
- '$(Pipeline.Workspace)/github/docker-compose-integration-tests.yml'
43+
- job: integration_test
44+
dependsOn: unit_test
45+
steps:
46+
- template: /templates/test/docker.yml@stratus-templates
47+
parameters:
48+
imageName: $(imageName)
49+
dockerfilePath: $(dockerfilePath)
50+
tag: $(tag)
51+
dockerComposeFilePaths:
52+
- '$(Pipeline.Workspace)/github/docker-compose-integration-tests.yml'
5253

53-
- job: build_publish
54-
dependsOn: unit_test
55-
steps:
56-
- template: templates/docker/build.yml@cet-iac
57-
parameters:
58-
runScan: true
59-
dockerFilePath: $(dockerfilePath)
60-
imageName: $(imageName)
61-
tag: $(tag)
54+
- job: build_publish
55+
dependsOn: unit_test
56+
steps:
57+
- template: /templates/docker/push.yml@stratus-templates
58+
parameters:
59+
build: true
60+
break: false
61+
dockerFilePath: $(dockerfilePath)
62+
imageName: $(imageName)
63+
tag: $(tag)
6264

63-
- template: templates/docker/push.yml@cet-iac
64-
parameters:
65-
dockerFilePath: $(dockerfilePath)
66-
imageName: $(imageName)
67-
tag: $(tag)
68-
69-
- stage: deploy_ref
70-
displayName: Deploy to Ref
71-
jobs:
72-
- job: update_appservice_image
73-
steps:
74-
- template: templates/app-service/update-image.yml@cet-iac
75-
parameters:
76-
parametersFileName: $(parametersFileName)
77-
appName: $(appName)
78-
imageName: $(imageName)
79-
tag: $(tag)
80-
isApi: true
65+
- stage: deploy_ref
66+
displayName: Deploy to Ref
67+
jobs:
68+
- job: update_appservice_image
69+
steps:
70+
- template: /templates/app-service/update-image.yml@stratus-templates
71+
parameters:
72+
parametersFileName: $(parametersFileName)
73+
imageName: $(imageName)
74+
tag: $(tag)

.azure/deploy-infra.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.azure/prod.parameters.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"appName": {
6-
"value": "node-api-prod"
6+
"value": "node-api"
7+
},
8+
"env": {
9+
"value": "prod"
710
},
811
"secretNames": {
912
"value": []

.azure/ref.parameters.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"appName": {
6-
"value": "node-api-ref"
6+
"value": "node-api"
7+
},
8+
"env": {
9+
"value": "ref"
710
},
811
"secretNames": {
912
"value": ["API_KEYS_0", "MONGODB_URI"]

0 commit comments

Comments
 (0)