chore(cicd): keep the same allure report directory no matter the run

kestra-io · Oct 1, 2024 · d2c7b0e · d2c7b0e
1 parent 255263a
commit d2c7b0e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -78,21 +78,21 @@ jobs:
           resultsGlob: "**/build/allure-results"
           bucket: internal-kestra-host
           baseUrl: "https://internal.kestra.io"
-          prefix: ${{ format('{0}/{1}/{2}', github.repository, env.GITHUB_HEAD_REF_SLUG != '' && env.GITHUB_HEAD_REF_SLUG || github.ref_name, 'allure/java') }}
+          prefix: ${{ format('{0}/{1}', github.repository, 'allure/java') }}
           copyLatest: true
           ignoreMissingResults: true
 
       # Jacoco
       - name: 'Set up Cloud SDK'
-        if: ${{ env.GOOGLE_SERVICE_ACCOUNT != 0 && (github.event.inputs.skip-test == 'false' || github.event.inputs.skip-test == '') }}
+        if: ${{ github.ref == 'refs/heads/develop' && env.GOOGLE_SERVICE_ACCOUNT != 0 && (github.event.inputs.skip-test == 'false' || github.event.inputs.skip-test == '') }}
         uses: 'google-github-actions/setup-gcloud@v2'
 
       - name: 'Copy jacoco files'
-        if: ${{ env.GOOGLE_SERVICE_ACCOUNT != 0 && (github.event.inputs.skip-test == 'false' || github.event.inputs.skip-test == '') }}
+        if: ${{ github.ref == 'refs/heads/develop' && env.GOOGLE_SERVICE_ACCOUNT != 0 && (github.event.inputs.skip-test == 'false' || github.event.inputs.skip-test == '') }}
         run: |
           mv build/reports/jacoco/testCodeCoverageReport build/reports/jacoco/test/
           mv build/reports/jacoco/test/testCodeCoverageReport.xml build/reports/jacoco/jacocoTestReport.xml
-          gsutil -m rsync -d -r  build/reports/jacoco/test/ gs://internal-kestra-host/${{ format('{0}/{1}/{2}', github.repository, env.GITHUB_HEAD_REF_SLUG != '' && env.GITHUB_HEAD_REF_SLUG || github.ref_name, 'jacoco') }}
+          gsutil -m rsync -d -r  build/reports/jacoco/test/ gs://internal-kestra-host/${{ format('{0}/{1}', github.repository, env.GITHUB_HEAD_REF_SLUG != '' && env.GITHUB_HEAD_REF_SLUG || github.ref_name, 'jacoco') }}
 
 
       # report test

diff --git a/core/src/test/resources/application-test.yml b/core/src/test/resources/application-test.yml
@@ -28,18 +28,6 @@ kestra:
       bool: true
       nested:
         int: 2
-  tasks:
-    defaults:
-    - type: io.kestra.core.services.PluginDefaultServiceTest$DefaultTester
-      values:
-        doubleValue: 19
-        arrays:
-          - 2
-        property:
-          here: me
-          lists:
-          - val:
-              key: test
 
   anonymous-usage-report:
     enabled: false
@@ -63,4 +51,16 @@ kestra:
           recoverMissedSchedules: ALL
       - type: io.kestra.core.runners.test.task.Alias
         values:
-          prop0: value0
+          prop0: value0
+
+    defaults:
+      - type: io.kestra.core.services.PluginDefaultServiceTest$DefaultTester
+        values:
+          doubleValue: 19
+          arrays:
+            - 2
+          property:
+            here: me
+            lists:
+              - val:
+                  key: test