From 95399207e6c3b4d582b2c384c210ae2ce1d64567 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 7 Jan 2026 01:28:28 +0000 Subject: [PATCH 1/2] Initial plan From cb9a7f008ccf47afd1751d739240bb7350d51640 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 7 Jan 2026 01:35:52 +0000 Subject: [PATCH 2/2] Fix CI workflow to run both modern and legacy tests with proper isolation Co-authored-by: yingbull <8680161+yingbull@users.noreply.github.com> --- .github/workflows/maven-project.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-project.yml b/.github/workflows/maven-project.yml index 36b6bfd8ceb..f6a631f0ab3 100644 --- a/.github/workflows/maven-project.yml +++ b/.github/workflows/maven-project.yml @@ -76,8 +76,24 @@ jobs: - name: Build project run: docker exec openo-tomcat-dev .devcontainer/development/scripts/make install - - name: Run unit tests & build JSP files - run: docker exec openo-tomcat-dev mvn package -Pjspc,modern-tests -Ddependency.lock.filename=dependencies-lock-modern.json + # Run tests in isolation matching the make script behavior + # Phase 1: Modern tests with JUnit 5 profile + - name: Build for modern tests + run: docker exec openo-tomcat-dev mvn clean -DskipModernTests=true -DskipLegacyTests=true -T 1C package war:exploded -Pjspc,modern-tests -Ddependency.lock.filename=dependencies-lock-modern.json + + - name: Run modern tests + run: docker exec openo-tomcat-dev mvn test -Pmodern-tests -DskipLegacyTests=true -Ddependency.lock.filename=dependencies-lock-modern.json + + # Clean up between test phases to ensure complete isolation + - name: Clean up between test phases + run: docker exec openo-tomcat-dev mvn clean -q + + # Phase 2: Legacy tests without JUnit 5 profile + - name: Build for legacy tests + run: docker exec openo-tomcat-dev mvn clean -DskipModernTests=true -DskipLegacyTests=true -T 1C package war:exploded -Pjspc + + - name: Run legacy tests + run: docker exec openo-tomcat-dev mvn test -DskipModernTests=true lint: runs-on: ubuntu-latest