ci: изменил хранение артефактов покрытия тестами

johnnyshut · Jul 9, 2024 · 9b70f6e · 9b70f6e
1 parent 6bc06d4
commit 9b70f6e
Showing 1 changed file with 41 additions and 30 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -216,11 +216,41 @@ coverage:
   timeout: 10m
   artifacts:
     reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage/coverage.xml
       junit:
         out/genericexec/*.xml
     paths:
+      - coverage/
       - out/genericexec/
     expire_in: 30 day
+  needs:
+    - job: 1testrunner
+
+SonarQube:
+  stage: report
+  variables:
+    GIT_STRATEGY: clone
+    SONAR_SCANNER_OPTS: "-Dfile.encoding=UTF8 -Dsun.jnu.encoding=UTF8 -Xmx6G"
+  allow_failure: true
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - changes:
+      - src/*
+      - features/*
+      - tasks/*
+      - tests/*
+  tags:
+    - OneScript
+  script:
+    # - $VERSION = sls -Path .\opm-metadata.xml -Pattern "<Version>(?<ver>\d\.\d\.\d)" -All | % { $_.Matches.Groups } | ? {$_.Name -eq "ver" } | % Value
+    # - sonar-scanner -D sonar.token=$SONAR_TOKEN -D sonar.projectVersion=$VERSION
+    - opm run sonar-scanner
+  timeout: 10m
+  needs:
+    - job: coverage
+      artifacts: true
 
 Allure:
   stage: report
@@ -245,11 +275,10 @@ Allure:
   needs:
     - job: 1testrunner
 
-SonarQube:
+pages:
   stage: report
   variables:
-    GIT_STRATEGY: clone
-    SONAR_SCANNER_OPTS: "-Dfile.encoding=UTF8 -Dsun.jnu.encoding=UTF8 -Xmx6G"
+    GIT_STRATEGY: none
   allow_failure: true
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -261,10 +290,16 @@ SonarQube:
   tags:
     - OneScript
   script:
-    # - $VERSION = sls -Path .\opm-metadata.xml -Pattern "<Version>(?<ver>\d\.\d\.\d)" -All | % { $_.Matches.Groups } | ? {$_.Name -eq "ver" } | % Value
-    # - sonar-scanner -D sonar.token=$SONAR_TOKEN -D sonar.projectVersion=$VERSION
-    - opm run sonar-scanner
+    - mkdir public;
+      move out/allure-report public
   timeout: 10m
+  artifacts:
+    paths:
+      - public
+  needs:
+    - job: Allure
+      artifacts: true
+    - job: SonarQube
 
 package:
   stage: release
@@ -314,27 +349,3 @@ release:
   timeout: 10m
   needs:
     - job: package
-
-pages:
-  stage: release
-  variables:
-    GIT_STRATEGY: none
-  allow_failure: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - changes:
-      - src/*
-      - features/*
-      - tasks/*
-      - tests/*
-  tags:
-    - OneScript
-  script:
-    - mkdir public;
-      move out/allure-report public
-  timeout: 10m
-  artifacts:
-    paths:
-      - public
-  needs:
-    - job: Allure