Postsubmission handlers

.github/workflows/build-test.yml

@@ -22,4 +22,4 @@ jobs:
           cache: 'maven'
 
       - name: Build and Test
-        run: mvn --batch-mode --update-snapshots --activate-profiles distro,validator clean package
+        run: mvn --batch-mode --update-snapshots --activate-profiles distro,validator clean verify

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

@@ -6,10 +6,9 @@ on:
   pull_request:
     branches: [main]
 
-jobs:
+jobs:  
   build:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
 
@@ -29,131 +28,17 @@ jobs:
           path: e2e_release_env_images.tar.gz
           retention-days: 1
 
-  run-patient-management-e2e-tests:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Temporary Directory to Download Docker Images
-        id: tempdir
-        run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
-
-      - name: Download Docker Images
-        uses: actions/download-artifact@v4
-        with:
-          name: e2e_release_env_images
-          path: ${{ steps.tempdir.outputs.tmpdir }}
-
-      - name: Load Docker Images
-        run: |
-          gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
-          docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
-          docker image ls -a
-
-      - name: Spin up an OpenMRS Instance
-        run: docker compose up -d
-        working-directory: e2e_test_support_files
-
-      - name: Checkout to the repo's main branch
-        uses: actions/checkout@v4
-        with:
-          repository: openmrs/openmrs-esm-patient-management
-          ref: main
-          path: e2e_repo
-
-      - name: Copy test environment variables
-        run: cp example.env .env
-        working-directory: e2e_repo
-
-      - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --immutable
-        working-directory: e2e_repo
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: e2e_repo
-
-      - name: Wait for the OpenMRS instance to start
-        run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
-
-      - name: Run E2E tests
-        run: yarn playwright test
-        working-directory: e2e_repo
-
-      - name: Upload Report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: report-patient-management
-          path: e2e_repo/playwright-report/
-          retention-days: 30
-
-  run-patient-chart-e2e-tests:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Temporary Directory to Download Docker Images
-        id: tempdir
-        run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
-
-      - name: Download Docker Images
-        uses: actions/download-artifact@v4
-        with:
-          name: e2e_release_env_images
-          path: ${{ steps.tempdir.outputs.tmpdir }}
-
-      - name: Load Docker Images
-        run: |
-          gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
-          docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
-          docker image ls -a
-
-      - name: Spin up an OpenMRS Instance
-        run: docker compose up -d
-        working-directory: e2e_test_support_files
-
-      - name: Checkout to the repo's main branch
-        uses: actions/checkout@v4
-        with:
-          repository: openmrs/openmrs-esm-patient-chart
-          ref: main
-          path: e2e_repo
-
-      - name: Copy test environment variables
-        run: cp example.env .env
-        working-directory: e2e_repo
-
-      - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --immutable
-        working-directory: e2e_repo
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: e2e_repo
-
-      - name: Wait for the OpenMRS instance to start
-        run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
-
-      - name: Run E2E tests
-        run: yarn playwright test
-        working-directory: e2e_repo
-
-      - name: Upload Report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: report-patient-chart
-          path: e2e_repo/playwright-report/
-          retention-days: 30
-
-  run-form-builder-e2e-tests:
+  run-e2e-tests:
     runs-on: ubuntu-latest
     needs: build
+    strategy:
+      matrix:
+        repo: 
+          - openmrs-esm-patient-management
+          - openmrs-esm-patient-chart
+          - openmrs-esm-form-builder
+          - openmrs-esm-core
+
     steps:
       - uses: actions/checkout@v4
 
@@ -180,7 +65,7 @@ jobs:
       - name: Checkout to the repo's main branch
         uses: actions/checkout@v4
         with:
-          repository: openmrs/openmrs-esm-form-builder
+          repository: openmrs/${{ matrix.repo }}
           ref: main
           path: e2e_repo
 
@@ -208,128 +93,21 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: report-form-builder
+          name: report-${{ matrix.repo }}
           path: e2e_repo/playwright-report/
           retention-days: 30
 
-  run-esm-core-e2e-tests:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Temporary Directory to Download Docker Images
-        id: tempdir
-        run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
-
-      - name: Download Docker Images
-        uses: actions/download-artifact@v4
-        with:
-          name: e2e_release_env_images
-          path: ${{ steps.tempdir.outputs.tmpdir }}
-
-      - name: Load Docker Images
-        run: |
-          gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
-          docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
-          docker image ls -a
-
-      - name: Spin up an OpenMRS Instance
-        run: docker compose up -d
-        working-directory: e2e_test_support_files
-
-      - name: Checkout to the repo's main branch
-        uses: actions/checkout@v4
-        with:
-          repository: openmrs/openmrs-esm-core
-          ref: main
-          path: e2e_repo
-
-      - name: Copy test environment variables
-        run: cp example.env .env
-        working-directory: e2e_repo
-
-      - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --immutable
-        working-directory: e2e_repo
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: e2e_repo
-
-      - name: Wait for the OpenMRS instance to start
-        run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
-
-      - name: Run E2E tests
-        run: yarn playwright test
-        working-directory: e2e_repo
-
-      - name: Upload Report
-        uses: actions/upload-artifact@v4
+      - name: 📝 Capture Server Logs
         if: always()
+        uses: jwalton/gh-docker-logs@v2
         with:
-          name: report-esm-core
-          path: e2e_repo/playwright-report/
-          retention-days: 30
-
-  run-cohort-builder-e2e-tests:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Temporary Directory to Download Docker Images
-        id: tempdir
-        run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
-
-      - name: Download Docker Images
-        uses: actions/download-artifact@v4
-        with:
-          name: e2e_release_env_images
-          path: ${{ steps.tempdir.outputs.tmpdir }}
-
-      - name: Load Docker Images
-        run: |
-          gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
-          docker load --input ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar
-          docker image ls -a
-
-      - name: Spin up an OpenMRS Instance
-        run: docker compose up -d
-        working-directory: e2e_test_support_files
-
-      - name: Checkout to the repo's main branch
-        uses: actions/checkout@v4
-        with:
-          repository: openmrs/openmrs-esm-cohortbuilder
-          ref: main
-          path: e2e_repo
-
-      - name: Copy test environment variables
-        run: cp example.env .env
-        working-directory: e2e_repo
-
-      - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --immutable
-        working-directory: e2e_repo
+          dest: "./logs"
 
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: e2e_repo
-
-      - name: Wait for the OpenMRS instance to start
-        run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done
-
-      - name: Run E2E tests
-        run: yarn playwright test
-        working-directory: e2e_repo
-
-      - name: Upload Report
+      - name: 📤 Upload Logs as Artifact
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: report-cohort-builder
-          path: e2e_repo/playwright-report/
-          retention-days: 30
+          name: server-logs-${{ matrix.repo }}
+          path: "./logs"
+          retention-days: 2
+          overwrite: true

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ### Dev Stage
-FROM openmrs/openmrs-core:dev-amazoncorretto-11 AS dev
+FROM openmrs/openmrs-core:dev-amazoncorretto-17 AS dev
 WORKDIR /openmrs_distro
 
 ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U -P distro"
@@ -14,23 +14,24 @@ COPY distro ./distro/
 # Build the distro, but only deploy from the amd64 build
 RUN --mount=type=secret,id=m2settings,target=/usr/share/maven/ref/settings-docker.xml if [[ "$MVN_ARGS" != "deploy" || "$(arch)" = "x86_64" ]]; then mvn $MVN_ARGS_SETTINGS $MVN_ARGS; else mvn $MVN_ARGS_SETTINGS install; fi
 
-RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs.war /openmrs/distribution/openmrs_core/
+RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/
 
 RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs-distro.properties /openmrs/distribution/
-RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/modules /openmrs/distribution/openmrs_modules
-RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/owa /openmrs/distribution/openmrs_owas
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_modules /openmrs/distribution/openmrs_modules/
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_owas /openmrs/distribution/openmrs_owas/
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_config /openmrs/distribution/openmrs_config/
 
 # Clean up after copying needed artifacts
 RUN mvn $MVN_ARGS_SETTINGS clean
 
 ### Run Stage
 # Replace 'nightly' with the exact version of openmrs-core built for production (if available)
-FROM openmrs/openmrs-core:nightly-amazoncorretto-11
+FROM openmrs/openmrs-core:nightly-amazoncorretto-17
 
 # Do not copy the war if using the correct openmrs-core image version
 COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/
 
 COPY --from=dev /openmrs/distribution/openmrs-distro.properties /openmrs/distribution/
 COPY --from=dev /openmrs/distribution/openmrs_modules /openmrs/distribution/openmrs_modules
 COPY --from=dev /openmrs/distribution/openmrs_owas /openmrs/distribution/openmrs_owas
-COPY --from=dev /openmrs_distro/distro/configuration /openmrs/distribution/openmrs_config
+COPY --from=dev  /openmrs/distribution/openmrs_config /openmrs/distribution/openmrs_config