Skip to content

Commit 57207b4

Browse files
pgorrindodkayiwaNethmiRodrigowikumChamithr-jheltandugon
authored
Dev into Test for v3.5.0 (#78) (#79)
* Switch to openmrs core version 2.7.2-SNAPSHOT * Bump initializer to version 2.9.0-SNAPSHOT * (feat) O3-2353: Use demo data content package (openmrs#885) * Revert "(feat) O3-2353: Use demo data content package" (openmrs#886) * Revert initializer and core version bump (openmrs#887) * (feat) O3-2353: Use demo data content package (openmrs#889) * (chore) O3-4426: Update OpenMRS version and Initializer version (openmrs#888) * Create surgery nav group (#68) Create surgery nav group that contains the condition and last hemoglobin of the patient * Update reporting modules versions * Delete distro/README.md * Modify start visit panel (#69) Remove the Punctuality and Insurance Policy Number attribute * Remove patient list app (openmrs#892) * (chore) O3-4460: Prevent over-dispensing medications (openmrs#893) * Revert "(chore) O3-4460: Prevent over-dispensing medications (openmrs#893)" This reverts commit 4b2ebf3. * Update backend versions * (chore): Bump initializer (openmrs#895) * (chore): Bump backend dependencies (openmrs#896) * (release) Release v3.3.0-rc.1 * (release-revert) Reset to dev versions * Set time to philippines (#71) Set of each container time to Philippines * Add more contact details in show more panel (#70) * Add more contact details Add facebook id, email address and philhealth id in the contact section * Add more contact details Add facebook id, email address and philhealth id in contact details section * Consistent username and password for database connections * Set OMRS SMS timezone to philippines (#72) * Set time to philippines Set of each container time to Philippines * Set sms TZ to Philippines Set sms TZ to Philippines * Change sms time zone to PHT * (chore): Update content packages * (chore): Update content package (openmrs#906) * (release) Release v3.3.1 * (chore): Remove unreleased modules (openmrs#907) * (release) Release v3.3.1-rc.1 * (release) Release 3.3.1 * merge Stock/3.5.0 into Dev (#75) * (release-revert) Reset to dev versions * O3-4492: Update the Queue module to 2.5.0 (openmrs#903) * (chore) O3-4332 : Update appointments version to 2.1.0-SNAPSHOT (openmrs#898) * (chore) update the Queue module to 2.6.0-SNAPSHOT (openmrs#908) * (chore) Bump EMR API from 2.2.0 to 2.3.0-SNAPSHOT (openmrs#910) * (chore) O3-4504: Optimize Distro E2E Test Workflow Using Matrix Strategy (openmrs#911) * (chore): Bump version of content packages (openmrs#912) * (chore) Upgrade to Java 17 from Java 11 (openmrs#913) * Bump the webservicesrest module version to 2.49.0-SNAPSHOT * Update FHIR2 version * Update openmrs core version to 2.7.3 * Restore patient list related frontend modules * Bump openmrs core to 2.7.4-SNAPSHOT * Bump legacyui module to 1.23.0-SNAPSHOT * Update module versions to latest (openmrs#920) * (release) Release v3.4.0-rc.1 * (release-revert) Reset to dev versions * Move dev3 to latest SNAPSHOT of demo content package * Update demo content version * Switch to SNAPSHOT content packages * Bump webservicesrest to 2.50.0-SNAPSHOT * (chore) Upgrade Node.js to 22 in frontend Dockerfile (openmrs#924) * Implement the same caching scheme adopted for module-spa See openmrs/openmrs-module-spa#63 and https://openmrs.atlassian.net/browse/O3-4395. In essence, almost everything is served with Cache-Control set to no-cache, must-revalidate. This means that any static content that is not either the openmrs.css file or a Javascript file will make a HTTP request with If-Modified-Since and If-None-Match headers. The server should respond to these with a 304 unless they've been changed, which is a fairly minimal response. Javascript files and openmrs.css are cached for one year. The idea here is to balance aggressive caching with the need for implementations to serve custom content from the same webroot. For implementations not using this image, module-spa implements very similar caching logic. * Update to core 2.7.5-SNAPSHOT with a fix for the conceptreferenceranges endpoint * Update backend modules to newly updated versions * Bump bedmanagement to 6.2.0-SNAPSHOT * (test)03-4887: Add support the dispensing app in the reff app e2e distro * add dispensing e2e * add dispensing to readme * README tweaks * Bump authentication module to 2.0.0-SNAPSHOT (openmrs#930) * Add CACHE_BUST work-around for backend * Bump FHIR2 to 2.6.0-SNAPSHOT * Give the backend a little longer to respond * (fix) Update frontend service queue config * (release) Release v3.5.0 * Update backend module versions * Update core version * Update bed management version * Fix REST version * Update rest version * Run E2E on every branch * Run build on push * Fix bedmanagement version * Fix bedmanagement version * (release) Release v3.5.0-rc.1 * Bump FHIR2 to 2.7.0 * (release) Release v3.5.0-rc.2 * (release) Release v3.5.0-rc.3 * Bump Queue module version * Remove stock management and billing frontends * Remove stock management and billing backend modules * Bump backend versions * Remove stock management and billing from distro.properties * Re-add stock and billing backend modules * Update distro.properties * (release) Release v3.5.0-rc.4 * Update App shell version to 8.0.0 * (release) Release v3.5.0-rc.5 * Bump queue module to version 2.9.0 * Bump Demo content package to 1.6.0 * Bump content ref app version to 1.4.0 * (release) Release v3.5.0-rc.6 * (release) Release 3.5.0 --------- * fixes (#77) --------- Co-authored-by: dkayiwa <[email protected]> Co-authored-by: Nethmi Rodrigo <[email protected]> Co-authored-by: Wikum Weerakutti <[email protected]> Co-authored-by: Nethmi Rodrigo <[email protected]> Co-authored-by: R-jhel B. Tandugon <[email protected]> Co-authored-by: druchniewicz <[email protected]> Co-authored-by: Ian <[email protected]> Co-authored-by: Dennis Kigen <[email protected]> Co-authored-by: Ian <[email protected]> Co-authored-by: openmrs-bot <[email protected]> Co-authored-by: praneeth <[email protected]> Co-authored-by: chibongho <[email protected]> Co-authored-by: Jayasanka Weerasinghe <[email protected]> Co-authored-by: Bawantha Thilan <[email protected]> Co-authored-by: Nethmi Rodrigo <[email protected]> Co-authored-by: gitcliff <[email protected]>
1 parent c60d118 commit 57207b4

File tree

43 files changed

+271
-451
lines changed

Some content is hidden

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

43 files changed

+271
-451
lines changed

‎.github/workflows/build-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build and Validate Configuration
22

33
on:
44
pull_request:
5-
branches: [main]
5+
push:
66

77
jobs:
88
build:

‎.github/workflows/e2e-on-release.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
esm_core_ref: ${{steps.refs.outputs.esm_core}}
1515
form_builder_ref: ${{steps.refs.outputs.form_builder}}
1616
cohort_builder_ref: ${{steps.refs.outputs.cohort_builder}}
17+
dispensing_ref: ${{steps.refs.outputs.dispensing}}
1718

1819
steps:
1920
- uses: actions/checkout@v4
@@ -347,3 +348,64 @@ jobs:
347348
name: report-cohort-builder
348349
path: e2e_repo/playwright-report/
349350
retention-days: 30
351+
352+
run-dispensing-app-e2e-tests:
353+
runs-on: ubuntu-latest
354+
needs: build
355+
steps:
356+
- uses: actions/checkout@v4
357+
358+
- name: Create Temporary Directory to Download Docker Images
359+
id: tempdir
360+
run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
361+
362+
- name: Download Docker Images
363+
uses: actions/download-artifact@v4
364+
with:
365+
name: e2e_release_env_images
366+
path: ${{ steps.tempdir.outputs.tmpdir }}
367+
368+
- name: Load Docker Images
369+
run: |
370+
gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
371+
docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
372+
docker image ls -a
373+
374+
- name: Spin up an OpenMRS Instance
375+
run: docker compose up -d
376+
working-directory: e2e_test_support_files
377+
378+
- name: Checkout to the Repo's Tag
379+
uses: actions/checkout@v4
380+
with:
381+
repository: openmrs/openmrs-esm-dispensing-app
382+
ref: ${{ needs.build.outputs.dispensing_ref }}
383+
path: e2e_repo
384+
385+
- name: Copy test environment variables
386+
run: cp example.env .env
387+
working-directory: e2e_repo
388+
389+
- name: Install dependencies
390+
if: steps.cache.outputs.cache-hit != 'true'
391+
run: yarn install --immutable
392+
working-directory: e2e_repo
393+
394+
- name: Install Playwright Browsers
395+
run: npx playwright install chromium --with-deps
396+
working-directory: e2e_repo
397+
398+
- name: Wait for the OpenMRS instance to start
399+
run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
400+
401+
- name: Run E2E tests
402+
run: yarn playwright test
403+
working-directory: e2e_repo
404+
405+
- name: Upload Report
406+
uses: actions/upload-artifact@v4
407+
if: always()
408+
with:
409+
name: report-dispensing-app
410+
path: e2e_repo/playwright-report/
411+
retention-days: 30

‎.github/workflows/e2e-tests-on-commit.yml‎

Lines changed: 21 additions & 244 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ name: Run E2E Tests on PRs and Commits
22

33
on:
44
push:
5-
branches: [main]
65
pull_request:
7-
branches: [main]
86

9-
jobs:
7+
jobs:
108
build:
119
runs-on: ubuntu-latest
12-
1310
steps:
1411
- uses: actions/checkout@v4
1512

@@ -29,131 +26,18 @@ jobs:
2926
path: e2e_release_env_images.tar.gz
3027
retention-days: 1
3128

32-
run-patient-management-e2e-tests:
33-
runs-on: ubuntu-latest
34-
needs: build
35-
steps:
36-
- uses: actions/checkout@v4
37-
38-
- name: Create Temporary Directory to Download Docker Images
39-
id: tempdir
40-
run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
41-
42-
- name: Download Docker Images
43-
uses: actions/download-artifact@v4
44-
with:
45-
name: e2e_release_env_images
46-
path: ${{ steps.tempdir.outputs.tmpdir }}
47-
48-
- name: Load Docker Images
49-
run: |
50-
gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
51-
docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
52-
docker image ls -a
53-
54-
- name: Spin up an OpenMRS Instance
55-
run: docker compose up -d
56-
working-directory: e2e_test_support_files
57-
58-
- name: Checkout to the repo's main branch
59-
uses: actions/checkout@v4
60-
with:
61-
repository: openmrs/openmrs-esm-patient-management
62-
ref: main
63-
path: e2e_repo
64-
65-
- name: Copy test environment variables
66-
run: cp example.env .env
67-
working-directory: e2e_repo
68-
69-
- name: Install dependencies
70-
if: steps.cache.outputs.cache-hit != 'true'
71-
run: yarn install --immutable
72-
working-directory: e2e_repo
73-
74-
- name: Install Playwright Browsers
75-
run: npx playwright install chromium --with-deps
76-
working-directory: e2e_repo
77-
78-
- name: Wait for the OpenMRS instance to start
79-
run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
80-
81-
- name: Run E2E tests
82-
run: yarn playwright test
83-
working-directory: e2e_repo
84-
85-
- name: Upload Report
86-
uses: actions/upload-artifact@v4
87-
if: always()
88-
with:
89-
name: report-patient-management
90-
path: e2e_repo/playwright-report/
91-
retention-days: 30
92-
93-
run-patient-chart-e2e-tests:
94-
runs-on: ubuntu-latest
95-
needs: build
96-
steps:
97-
- uses: actions/checkout@v4
98-
99-
- name: Create Temporary Directory to Download Docker Images
100-
id: tempdir
101-
run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
102-
103-
- name: Download Docker Images
104-
uses: actions/download-artifact@v4
105-
with:
106-
name: e2e_release_env_images
107-
path: ${{ steps.tempdir.outputs.tmpdir }}
108-
109-
- name: Load Docker Images
110-
run: |
111-
gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
112-
docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
113-
docker image ls -a
114-
115-
- name: Spin up an OpenMRS Instance
116-
run: docker compose up -d
117-
working-directory: e2e_test_support_files
118-
119-
- name: Checkout to the repo's main branch
120-
uses: actions/checkout@v4
121-
with:
122-
repository: openmrs/openmrs-esm-patient-chart
123-
ref: main
124-
path: e2e_repo
125-
126-
- name: Copy test environment variables
127-
run: cp example.env .env
128-
working-directory: e2e_repo
129-
130-
- name: Install dependencies
131-
if: steps.cache.outputs.cache-hit != 'true'
132-
run: yarn install --immutable
133-
working-directory: e2e_repo
134-
135-
- name: Install Playwright Browsers
136-
run: npx playwright install chromium --with-deps
137-
working-directory: e2e_repo
138-
139-
- name: Wait for the OpenMRS instance to start
140-
run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
141-
142-
- name: Run E2E tests
143-
run: yarn playwright test
144-
working-directory: e2e_repo
145-
146-
- name: Upload Report
147-
uses: actions/upload-artifact@v4
148-
if: always()
149-
with:
150-
name: report-patient-chart
151-
path: e2e_repo/playwright-report/
152-
retention-days: 30
153-
154-
run-form-builder-e2e-tests:
29+
run-e2e-tests:
15530
runs-on: ubuntu-latest
15631
needs: build
32+
strategy:
33+
matrix:
34+
repo:
35+
- openmrs-esm-patient-management
36+
- openmrs-esm-patient-chart
37+
- openmrs-esm-form-builder
38+
- openmrs-esm-core
39+
- openmrs-esm-dispensing-app
40+
15741
steps:
15842
- uses: actions/checkout@v4
15943

@@ -180,7 +64,7 @@ jobs:
18064
- name: Checkout to the repo's main branch
18165
uses: actions/checkout@v4
18266
with:
183-
repository: openmrs/openmrs-esm-form-builder
67+
repository: openmrs/${{ matrix.repo }}
18468
ref: main
18569
path: e2e_repo
18670

@@ -208,128 +92,21 @@ jobs:
20892
uses: actions/upload-artifact@v4
20993
if: always()
21094
with:
211-
name: report-form-builder
95+
name: report-${{ matrix.repo }}
21296
path: e2e_repo/playwright-report/
21397
retention-days: 30
21498

215-
run-esm-core-e2e-tests:
216-
runs-on: ubuntu-latest
217-
needs: build
218-
steps:
219-
- uses: actions/checkout@v4
220-
221-
- name: Create Temporary Directory to Download Docker Images
222-
id: tempdir
223-
run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
224-
225-
- name: Download Docker Images
226-
uses: actions/download-artifact@v4
227-
with:
228-
name: e2e_release_env_images
229-
path: ${{ steps.tempdir.outputs.tmpdir }}
230-
231-
- name: Load Docker Images
232-
run: |
233-
gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
234-
docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
235-
docker image ls -a
236-
237-
- name: Spin up an OpenMRS Instance
238-
run: docker compose up -d
239-
working-directory: e2e_test_support_files
240-
241-
- name: Checkout to the repo's main branch
242-
uses: actions/checkout@v4
243-
with:
244-
repository: openmrs/openmrs-esm-core
245-
ref: main
246-
path: e2e_repo
247-
248-
- name: Copy test environment variables
249-
run: cp example.env .env
250-
working-directory: e2e_repo
251-
252-
- name: Install dependencies
253-
if: steps.cache.outputs.cache-hit != 'true'
254-
run: yarn install --immutable
255-
working-directory: e2e_repo
256-
257-
- name: Install Playwright Browsers
258-
run: npx playwright install chromium --with-deps
259-
working-directory: e2e_repo
260-
261-
- name: Wait for the OpenMRS instance to start
262-
run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
263-
264-
- name: Run E2E tests
265-
run: yarn playwright test
266-
working-directory: e2e_repo
267-
268-
- name: Upload Report
269-
uses: actions/upload-artifact@v4
99+
- name: 📝 Capture Server Logs
270100
if: always()
101+
uses: jwalton/gh-docker-logs@v2
271102
with:
272-
name: report-esm-core
273-
path: e2e_repo/playwright-report/
274-
retention-days: 30
275-
276-
run-cohort-builder-e2e-tests:
277-
runs-on: ubuntu-latest
278-
needs: build
279-
steps:
280-
- uses: actions/checkout@v4
281-
282-
- name: Create Temporary Directory to Download Docker Images
283-
id: tempdir
284-
run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
285-
286-
- name: Download Docker Images
287-
uses: actions/download-artifact@v4
288-
with:
289-
name: e2e_release_env_images
290-
path: ${{ steps.tempdir.outputs.tmpdir }}
291-
292-
- name: Load Docker Images
293-
run: |
294-
gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
295-
docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
296-
docker image ls -a
297-
298-
- name: Spin up an OpenMRS Instance
299-
run: docker compose up -d
300-
working-directory: e2e_test_support_files
301-
302-
- name: Checkout to the repo's main branch
303-
uses: actions/checkout@v4
304-
with:
305-
repository: openmrs/openmrs-esm-cohortbuilder
306-
ref: main
307-
path: e2e_repo
308-
309-
- name: Copy test environment variables
310-
run: cp example.env .env
311-
working-directory: e2e_repo
312-
313-
- name: Install dependencies
314-
if: steps.cache.outputs.cache-hit != 'true'
315-
run: yarn install --immutable
316-
working-directory: e2e_repo
103+
dest: "./logs"
317104

318-
- name: Install Playwright Browsers
319-
run: npx playwright install chromium --with-deps
320-
working-directory: e2e_repo
321-
322-
- name: Wait for the OpenMRS instance to start
323-
run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
324-
325-
- name: Run E2E tests
326-
run: yarn playwright test
327-
working-directory: e2e_repo
328-
329-
- name: Upload Report
105+
- name: 📤 Upload Logs as Artifact
330106
uses: actions/upload-artifact@v4
331107
if: always()
332108
with:
333-
name: report-cohort-builder
334-
path: e2e_repo/playwright-report/
335-
retention-days: 30
109+
name: server-logs-${{ matrix.repo }}
110+
path: "./logs"
111+
retention-days: 2
112+
overwrite: true

0 commit comments

Comments
 (0)