diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..f7a2e19 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,33 @@ +name: CI + +on: + push: + branches: + - 'main' + - 'branch-test' + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 21 + + - name: Checkout sources + uses: actions/checkout@v1 + + - name: Build with Maven + run: mvn --batch-mode -P jacoco install + + - name: Run SonarCloud analysis + run: > + mvn --batch-mode -DskipTests sonar:sonar + -Dsonar.host.url=https://sonarcloud.io + -Dsonar.organization=gridsuite + env: + GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java b/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java index da5a24c..ea8fcd3 100644 --- a/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java +++ b/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java @@ -13,5 +13,28 @@ public enum ProcessStatus { SCHEDULED, RUNNING, COMPLETED, - FAILED + FAILED, + TEST1, + TEST2, + TEST3, + TEST4, + TEST5, + TEST6, + TEST7, + TEST8, + TEST9, + TEST10, + TEST11, + TEST12, + TEST13, + TEST14, + TEST15, + TEST16, + TEST17, + TEST18, + TEST19, + TEST20, + TEST21, + TEST22, + TEST23, } diff --git a/monitor-server/pom.xml b/monitor-server/pom.xml index 1a53beb..2f5565f 100644 --- a/monitor-server/pom.xml +++ b/monitor-server/pom.xml @@ -31,6 +31,23 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report + + + + ${project.basedir}/../monitor-commons/target/classes + ${project.basedir}/../monitor-commons/src/main/java + + + + com.google.cloud.tools jib-maven-plugin @@ -150,4 +167,32 @@ test + + + + + jacoco + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + verify + + report-aggregate + + + ${project.parent.name} + + + + + + + + diff --git a/monitor-worker-server/pom.xml b/monitor-worker-server/pom.xml index f124ed4..8524002 100644 --- a/monitor-worker-server/pom.xml +++ b/monitor-worker-server/pom.xml @@ -27,6 +27,23 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report + + + + ${project.basedir}/../monitor-commons/target/classes + ${project.basedir}/../monitor-commons/src/main/java + + + + com.google.cloud.tools jib-maven-plugin @@ -143,6 +160,33 @@ spring-boot-starter-test test - + + + + + jacoco + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + verify + + report-aggregate + + + ${project.parent.name} + + + + + + + + diff --git a/pom.xml b/pom.xml index 03e52b3..5dc9e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,10 @@ 46.0.0 gridsuite org.gridsuite:monitor-core + + ${maven.multiModuleProjectDirectory}/monitor-server/target/site/jacoco/jacoco.xml, + ${maven.multiModuleProjectDirectory}/monitor-worker-server/target/site/jacoco/jacoco.xml, +