Skip to content

Commit 07fa78f

Browse files
CDR-FarooqKCDR-FarooqK
authored
v1.2.5 release (#76)
2 parents 5dc646e + ce94d75 commit 07fa78f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1027
-5175
lines changed

‎.azuredevops/pipelines/build-no-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ steps:
6666
displayName: 'Install dotnet-ef'
6767
condition: always()
6868
inputs:
69-
script: 'dotnet tool install --global dotnet-ef'
69+
script: 'dotnet tool install --version 7.0.13 --global dotnet-ef'
7070

7171
- task: CmdLine@2
7272
displayName: 'Check dotnet-ef version'

‎.azuredevops/pipelines/build-v2.yml‎

Lines changed: 40 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ variables:
88
containerTag: develop
99

1010
baseSourceDirectory: $(Build.SourcesDirectory)/Source
11+
dockerComposeDirectory: $(baseSourceDirectory)/DockerCompose
1112

1213
trigger:
1314
- develop
@@ -51,7 +52,7 @@ jobs:
5152
docker pull $(AcrBaseUrl).azurecr.io/mock-data-holder-energy:$(containerTag)
5253
docker tag $(AcrBaseUrl).azurecr.io/mock-register:$(containerTag) mock-register:latest
5354
docker tag $(AcrBaseUrl).azurecr.io/mock-data-holder:$(containerTag) mock-data-holder:latest
54-
docker tag $(AcrBaseUrl).azurecr.io/mock-data-holder-energy:$(containerTag) mock-data-holder-energy:latest
55+
docker tag $(AcrBaseUrl).azurecr.io/mock-data-holder-energy:$(containerTag) mock-data-holder-energy:latest
5556
5657
# List docker images
5758
- task: Docker@2
@@ -61,48 +62,37 @@ jobs:
6162
command: images
6263

6364
# Run unit tests
64-
- task: DockerCompose@0
65-
displayName: Unit tests - Up
66-
inputs:
67-
action: Run a Docker Compose command
68-
dockerComposeFile: $(baseSourceDirectory)/docker-compose.UnitTests.yml
69-
dockerComposeCommand: up --abort-on-container-exit --exit-code-from mock-data-recipient-unit-tests
65+
- script: |
66+
docker compose --file $(dockerComposeDirectory)/docker-compose.UnitTests.yml up --abort-on-container-exit --exit-code-from mock-data-recipient-unit-tests
67+
displayName: Unit Tests - Up
68+
condition: always()
7069
7170
# Remove unit tests
72-
- task: DockerCompose@0
73-
displayName: Unit tests - Down
74-
condition: always()
75-
inputs:
76-
action: Run a Docker Compose command
77-
dockerComposeFile: $(baseSourceDirectory)/docker-compose.UnitTests.yml
78-
dockerComposeCommand: down
71+
- script: |
72+
docker compose --file $(dockerComposeDirectory)/docker-compose.UnitTests.yml down
73+
displayName: 'Unit Tests - Down'
74+
condition: always()
7975
8076
# Run integration tests
81-
- task: DockerCompose@0
77+
- script: |
78+
docker compose --file $(dockerComposeDirectory)/docker-compose.IntegrationTests.yml up --abort-on-container-exit --exit-code-from mock-data-recipient-integration-tests
8279
displayName: Integration tests - Up
8380
condition: always()
84-
inputs:
85-
action: Run a Docker Compose command
86-
dockerComposeFile: $(baseSourceDirectory)/docker-compose.IntegrationTests.yml
87-
dockerComposeCommand: up --abort-on-container-exit --exit-code-from mock-data-recipient-integration-tests
8881
8982
# Output Docker Logs
9083
- script: |
91-
docker logs mock-register
92-
docker logs mock-data-holder
93-
docker logs mock-data-holder-energy
94-
docker logs mock-data-recipient
84+
docker logs mock-register-mdr-int
85+
docker logs mock-data-holder-mdr-int
86+
docker logs mock-data-holder-energy-mdr-int
87+
docker logs mock-data-recipient-mdr-int
9588
displayName: 'Output Docker Logs'
9689
condition: always()
9790
9891
# Remove integration tests
99-
- task: DockerCompose@0
100-
displayName: Integration tests - Down
101-
condition: always()
102-
inputs:
103-
action: Run a Docker Compose command
104-
dockerComposeFile: $(baseSourceDirectory)/docker-compose.IntegrationTests.yml
105-
dockerComposeCommand: down
92+
- script: |
93+
docker compose --file $(dockerComposeDirectory)/docker-compose.IntegrationTests.yml down
94+
displayName: 'Integration tests - Down'
95+
condition: always()
10696
10797
# Surface Integration tests TRX results to Devops
10898
- task: PublishTestResults@2
@@ -111,37 +101,31 @@ jobs:
111101
inputs:
112102
testResultsFormat: 'VSTest'
113103
testResultsFiles: '**/results.trx'
114-
searchFolder: $(baseSourceDirectory)/_temp/mock-data-recipient-integration-tests/testresults
104+
searchFolder: $(dockerComposeDirectory)/_temp/mock-data-recipient-integration-tests/testresults
115105
mergeTestResults: true
116106
testRunTitle: 'mock-data-recipient-Integration-tests'
117107
publishRunAttachments: true
118108

119109
# Run e2e tests
120-
- task: DockerCompose@0
110+
- script: |
111+
docker compose --file $(dockerComposeDirectory)/docker-compose.E2ETests.yml up --abort-on-container-exit --exit-code-from mock-data-recipient-e2e-tests
121112
displayName: E2E tests - Up
122113
condition: always()
123-
inputs:
124-
action: Run a Docker Compose command
125-
dockerComposeFile: $(baseSourceDirectory)/docker-compose.E2ETests.yml
126-
dockerComposeCommand: up --abort-on-container-exit --exit-code-from mock-data-recipient-e2e-tests
127114
128115
# Output Docker Logs
129116
- script: |
130-
docker logs mock-register
131-
docker logs mock-data-holder
132-
docker logs mock-data-holder-energy
133-
docker logs mock-data-recipient
117+
docker logs mock-register-mdr-e2e
118+
docker logs mock-data-holder-mdr-e2e
119+
docker logs mock-data-holder-energy-mdr-e2e
120+
docker logs mock-data-recipient-mdr-e2e
134121
displayName: 'Output Docker Logs'
135122
condition: always()
136123
137124
# Remove e2e tests
138-
- task: DockerCompose@0
139-
displayName: E2E tests - Down
140-
condition: always()
141-
inputs:
142-
action: Run a Docker Compose command
143-
dockerComposeFile: $(baseSourceDirectory)/docker-compose.E2ETests.yml
144-
dockerComposeCommand: down
125+
- script: |
126+
docker compose --file $(dockerComposeDirectory)/docker-compose.E2ETests.yml down
127+
displayName: 'E2E tests - Down'
128+
condition: always()
145129
146130
# Surface E2E tests TRX results to Devops
147131
- task: PublishTestResults@2
@@ -150,7 +134,7 @@ jobs:
150134
inputs:
151135
testResultsFormat: 'VSTest'
152136
testResultsFiles: '**/results.trx'
153-
searchFolder: $(baseSourceDirectory)/_temp/mock-data-recipient-e2e-tests/testresults
137+
searchFolder: $(dockerComposeDirectory)/_temp/mock-data-recipient-e2e-tests/testresults
154138
mergeTestResults: true
155139
testRunTitle: 'mock-data-recipient-E2E-tests'
156140
publishRunAttachments: true
@@ -173,66 +157,38 @@ jobs:
173157
path: $(build.artifactstagingdirectory)
174158
artifact: Container Images
175159

176-
# FIXME - MJS - See dockercompose, volume no longer mapped as 1001:121 (vsts:docker) in build pipeline and causes issue with chown in dockerfile (appuser:appgroup), ie stops register from starting because of different user
177-
# # Publish mock-register logs
178-
# - publish: $(baseSourceDirectory)/_temp/mock-register/tmp
179-
# displayName: Publish MockRegister logs
180-
# condition: always()
181-
# artifact: Mock-Register - Logs
182-
183-
# FIXME - MJS - See dockercompose, volume no longer mapped as 1001:121 (vsts:docker) in build pipeline and causes issue with chown in dockerfile (appuser:appgroup), ie stops register from starting because of different user
184-
# # Publish mock-data-holder logs
185-
# - publish: $(baseSourceDirectory)/_temp/mock-data-holder/tmp
186-
# displayName: Publish MockDataHolder logs
187-
# condition: always()
188-
# artifact: Mock-Data-Holder - Logs
189-
190-
# FIXME - MJS - See dockercompose, volume no longer mapped as 1001:121 (vsts:docker) in build pipeline and causes issue with chown in dockerfile (appuser:appgroup), ie stops register from starting because of different user
191-
# # Publish mock-data-holder-energy logs
192-
# - publish: $(baseSourceDirectory)/_temp/mock-data-holder-energy/tmp
193-
# displayName: Publish MockDataHolder-Energy logs
194-
# condition: always()
195-
# artifact: Mock-Data-Holder-Energy - Logs
196-
197-
# FIXME - MJS - See dockercompose, volume no longer mapped as 1001:121 (vsts:docker) in build pipeline and causes issue with chown in dockerfile (appuser:appgroup), ie stops register from starting because of different user
198-
# # Publish mock-data-recipient logs
199-
# - publish: $(baseSourceDirectory)/_temp/mock-data-recipient/tmp
200-
# displayName: Publish MockDataRecipient logs
201-
# condition: always()
202-
# artifact: Mock-Data-Recipient - Logs
203-
204160
# Publish mock-data-recipient unit tests results
205-
- publish: $(baseSourceDirectory)/_temp/mock-data-recipient-unit-tests/testresults
161+
- publish: $(dockerComposeDirectory)/_temp/mock-data-recipient-unit-tests/testresults
206162
displayName: Publish unit tests
207163
condition: always()
208164
artifact: Mock-Data-Recipient - Unit tests
209165

210166
# Run trx formatter to output .MD and .CSV
211167
- script: |
212168
docker run \
213-
-v=$(baseSourceDirectory)/_temp/mock-data-recipient-integration-tests/testresults/results.trx:/app/results.trx:ro \
214-
-v=$(baseSourceDirectory)/_temp/mock-data-recipient-integration-tests/testresults/formatted/:/app/out/:rw \
169+
-v=$(dockerComposeDirectory)/_temp/mock-data-recipient-integration-tests/testresults/results.trx:/app/results.trx:ro \
170+
-v=$(dockerComposeDirectory)/_temp/mock-data-recipient-integration-tests/testresults/formatted/:/app/out/:rw \
215171
$(AcrBaseUrl).azurecr.io/trx-formatter -i results.trx -t "MDR" --outputprefix "MDR" -o out/
216172
displayName: 'Run trx-formatter for integration tests'
217173
condition: always()
218174
219175
# Publish mock-data-recipient integration tests results
220-
- publish: $(baseSourceDirectory)/_temp/mock-data-recipient-integration-tests/testresults
176+
- publish: $(dockerComposeDirectory)/_temp/mock-data-recipient-integration-tests/testresults
221177
displayName: Publish integration tests
222178
condition: always()
223179
artifact: Mock-Data-Recipient - Integration tests
224180

225181
# Run trx formatter to output .MD and .CSV
226182
- script: |
227183
docker run \
228-
-v=$(baseSourceDirectory)/_temp/mock-data-recipient-e2e-tests/testresults/results.trx:/app/results.trx:ro \
229-
-v=$(baseSourceDirectory)/_temp/mock-data-recipient-e2e-tests/testresults/formatted/:/app/out/:rw \
184+
-v=$(dockerComposeDirectory)/_temp/mock-data-recipient-e2e-tests/testresults/results.trx:/app/results.trx:ro \
185+
-v=$(dockerComposeDirectory)/_temp/mock-data-recipient-e2e-tests/testresults/formatted/:/app/out/:rw \
230186
$(AcrBaseUrl).azurecr.io/trx-formatter -i results.trx -t "MDR-E2E" --outputprefix "MDR-E2E" -o out/
231187
displayName: 'Run trx-formatter for E2E tests'
232188
condition: always()
233189
234190
# Publish mock-data-recipient e2e tests results
235-
- publish: $(baseSourceDirectory)/_temp/mock-data-recipient-e2e-tests/testresults
191+
- publish: $(dockerComposeDirectory)/_temp/mock-data-recipient-e2e-tests/testresults
236192
displayName: Publish e2e tests
237193
condition: always()
238194
artifact: Mock-Data-Recipient - E2E tests
@@ -249,7 +205,7 @@ jobs:
249205
displayName: 'Install dotnet-ef'
250206
condition: always()
251207
inputs:
252-
script: 'dotnet tool install --global dotnet-ef'
208+
script: 'dotnet tool install --version 7.0.13 --global dotnet-ef'
253209

254210
- task: CmdLine@2
255211
displayName: 'Check dotnet-ef version'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
# Initializes the CodeQL tools for scanning.
6161
- name: Initialize CodeQL
62-
uses: github/codeql-action/init@v1
62+
uses: github/codeql-action/init@v2
6363
with:
6464
languages: ${{ matrix.language }}
6565
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,9 +70,9 @@ jobs:
7070
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
7171
# If this step fails, then you should remove it and run the build manually (see below)
7272
- name: Autobuild
73-
uses: github/codeql-action/autobuild@v1
73+
uses: github/codeql-action/autobuild@v2
7474

75-
# ℹ️ Command-line programs to run using the OS shell.
75+
# ℹ️ Command-line programs to run using the OS shell
7676
# 📚 https://git.io/JvXDl
7777

7878
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
@@ -84,4 +84,4 @@ jobs:
8484
# make release
8585

8686
- name: Perform CodeQL Analysis
87-
uses: github/codeql-action/analyze@v1
87+
uses: github/codeql-action/analyze@v2

‎.github/workflows/docker.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,12 @@ jobs:
7878

7979
- name: Image digest
8080
run: echo ${{ steps.docker_build.outputs.digest }}
81+
82+
- name: Docker Hub Description
83+
if: ${{ github.repository_owner == 'ConsumerDataRight' && github.ref_name == 'main' }}
84+
uses: peter-evans/dockerhub-description@v3
85+
with:
86+
username: ${{ secrets.DOCKERHUB_USERNAME }}
87+
password: ${{ secrets.DOCKERHUB_TOKEN }}
88+
repository: ${{ env.DOCKER_IMAGE }}
89+
enable-url-completion: true

‎.github/workflows/dotnet.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ jobs:
101101
# Run integration tests
102102
- name: Run integration tests
103103
run: |
104-
docker-compose -f './mock-data-recipient/Source/docker-compose.IntegrationTests.yml' up --abort-on-container-exit --exit-code-from mock-data-recipient-integration-tests
104+
docker compose -f './mock-data-recipient/Source/DockerCompose/docker-compose.IntegrationTests.yml' up --abort-on-container-exit --exit-code-from mock-data-recipient-integration-tests
105105
106106
# Remove integration tests
107107
- name: Remove integration tests
108108
run: |
109-
docker-compose -f './mock-data-recipient/Source/docker-compose.IntegrationTests.yml' down
109+
docker compose -f './mock-data-recipient/Source/DockerCompose/docker-compose.IntegrationTests.yml' down
110110
111111
# List docker images
112112
- name: List Docker images
@@ -121,12 +121,12 @@ jobs:
121121
# Run e2e tests
122122
- name: Run e2e tests
123123
run: |
124-
docker-compose -f './mock-data-recipient/Source/docker-compose.E2ETests.yml' up --abort-on-container-exit --exit-code-from mock-data-recipient-e2e-tests
124+
docker compose -f './mock-data-recipient/Source/DockerCompose/docker-compose.E2ETests.yml' up --abort-on-container-exit --exit-code-from mock-data-recipient-e2e-tests
125125
126126
# Remove e2e tests
127127
- name: Remove e2e tests
128128
run: |
129-
docker-compose -f './mock-data-recipient/Source/docker-compose.E2ETests.yml' down
129+
docker compose -f './mock-data-recipient/Source/DockerCompose/docker-compose.E2ETests.yml' down
130130
131131
# Build mock-data-recipient-unit-tests image
132132
- name: Build the mock-data-recipient-unit-tests image
@@ -136,65 +136,65 @@ jobs:
136136
# Run unit tests
137137
- name: Run unit tests
138138
run: |
139-
docker-compose -f './mock-data-recipient/Source/docker-compose.UnitTests.yml' up --abort-on-container-exit --exit-code-from mock-data-recipient-unit-tests
139+
docker compose -f './mock-data-recipient/Source/DockerCompose/docker-compose.UnitTests.yml' up --abort-on-container-exit --exit-code-from mock-data-recipient-unit-tests
140140
141141
# Remove unit tests
142142
- name: Remove unit tests
143143
run: |
144-
docker-compose -f './mock-data-recipient/Source/docker-compose.UnitTests.yml' down
144+
docker compose -f './mock-data-recipient/Source/DockerCompose/docker-compose.UnitTests.yml' down
145145
146146
# Archive unit test results
147147
- name: Archive unit test results
148148
uses: actions/upload-artifact@v2
149149
if: always()
150150
with:
151151
name: unit-test-results
152-
path: ${{ github.workspace }}/mock-data-recipient/Source/_temp/mock-data-recipient-unit-tests/testresults
152+
path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-data-recipient-unit-tests/testresults
153153

154154
# Archive integration test results
155155
- name: Archive integration test results
156156
uses: actions/upload-artifact@v2
157157
if: always()
158158
with:
159159
name: integration-test-results
160-
path: ${{ github.workspace }}/mock-data-recipient/Source/_temp/mock-data-recipient-integration-tests/testresults
160+
path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-data-recipient-integration-tests/testresults
161161

162162
# Archive e2e test results
163163
- name: Archive e2e test results
164164
uses: actions/upload-artifact@v2
165165
if: always()
166166
with:
167167
name: e2e-test-results
168-
path: ${{ github.workspace }}/mock-data-recipient/Source/_temp/mock-data-recipient-e2e-tests/testresults
168+
path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-data-recipient-e2e-tests/testresults
169169

170170
# Archive mock data recipient logs
171171
- name: Archive mock data recipient logs
172172
uses: actions/upload-artifact@v2
173173
if: always()
174174
with:
175175
name: integration-test-artifacts
176-
path: ${{ github.workspace }}/mock-data-recipient/Source/_temp/mock-data-recipient/tmp
176+
path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-data-recipient/tmp
177177

178178
# Archive mock data holder logs
179179
- name: Archive mock data holder logs
180180
uses: actions/upload-artifact@v2
181181
if: always()
182182
with:
183183
name: integration-test-artifacts
184-
path: ${{ github.workspace }}/mock-data-recipient/Source/_temp/mock-data-holder/tmp
184+
path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-data-holder/tmp
185185

186186
# Archive mock data holder energy logs
187187
- name: Archive mock data holder energy logs
188188
uses: actions/upload-artifact@v2
189189
if: always()
190190
with:
191191
name: integration-test-artifacts
192-
path: ${{ github.workspace }}/mock-data-recipient/Source/_temp/mock-data-holder-energy/tmp
192+
path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-data-holder-energy/tmp
193193

194194
# Archive mock register logs
195195
- name: Archive mock register logs
196196
uses: actions/upload-artifact@v2
197197
if: always()
198198
with:
199199
name: integration-test-artifacts
200-
path: ${{ github.workspace }}/mock-data-recipient/Source/_temp/mock-register/tmp
200+
path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-register/tmp

0 commit comments

Comments
 (0)