Feature/yksinkertaistetaan raportointi logiikkaa (#22)

Co-authored-by: moilanik <niko.moilanen@tietoevry.com>
Reviewed-on: #22

.gitea/workflows/example-bats-tests.yml

@@ -6,8 +6,9 @@ on:
         required: true
         type: string
       bats-image:
-        required: true
+        required: false
         type: string
+        default: gitea.app.keskikuja.site/niko/ci-bats:latest
     secrets:
       GITEA_TOKEN:
         required: true
@@ -23,6 +24,8 @@ env:
 jobs:
   bats:
     runs-on: ubuntu-latest
+    container:
+      image: ${{ inputs.bats-image }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
@@ -31,34 +34,18 @@ jobs:
           path: .ci
 
       - name: Run bats tests
-        id: bats-tests
-        shell: bash
         run: |
-          docker volume create bats-workspace
-          tar c . | docker run --rm -i -v bats-workspace:/data alpine tar x -C /data
-          mkdir -p "reports/${GITHUB_SHA:0:8}/bats"
-          set +e
-          docker run --rm \
-            -v bats-workspace:/data \
-            --entrypoint bash ${{ inputs.bats-image }} \
-            -c 'cd /data && bashcov -- bats tests/' \
-            > "reports/${GITHUB_SHA:0:8}/bats/results.txt" 2>&1
-          BATS_EXIT=$?
-          bash .ci/.gitea/scripts/bats-coverage.sh bats-workspace "reports/${GITHUB_SHA:0:8}/bats"
-          docker volume rm bats-workspace > /dev/null 2>&1
-          bash .ci/.gitea/scripts/bats-report.sh "reports/${GITHUB_SHA:0:8}/bats"
-          echo "BATS_EXIT=${BATS_EXIT}" >> "${GITHUB_ENV}"
-          exit ${BATS_EXIT}
+          mkdir -p reports/bats
+          bashcov -- bats tests/ > reports/bats/results.txt 2>&1
 
-      - name: Publish bats reports
+      - name: Post-process coverage
         if: always()
-        run: bash .ci/scripts/publish-git-pages.sh bats
+        run: bash .ci/.gitea/scripts/bats-coverage.sh reports/bats
 
-      - name: Report status
+      - name: Post-process test report
         if: always()
-        run: |
-          if [ "${BATS_EXIT}" = "0" ]; then
-            bash .ci/scripts/report-status.sh success "Link to Bats reports" unit-tests bats
-          else
-            bash .ci/scripts/report-status.sh failure "Link to Bats reports" unit-tests bats
-          fi
+        run: bash .ci/.gitea/scripts/bats-report.sh reports/bats
+
+      - name: Report
+        if: always()
+        run: bash .ci/scripts/ci-report.sh "Bats test report" unit-tests bats

.gitea/workflows/example-build-ci-cucumber.yml

@@ -25,14 +25,14 @@ on:
 
 jobs:
   load-config:
-    uses: niko/gitea-ci-library/.gitea/workflows/config-provider.yml@v1
+    uses: niko/gitea-ci-library/.gitea/workflows/config-provider.yml@main
     secrets: inherit
     with:
       config_path: ${{ inputs.config_path }}
 
   build-push:
     needs: [load-config]
-    uses: niko/gitea-ci-library/.gitea/workflows/ci-container-build-push.yml@v1
+    uses: niko/gitea-ci-library/.gitea/workflows/ci-container-build-push.yml@main
     secrets: inherit
     with:
       env_json: ${{ needs.load-config.outputs.env_json }}

.gitea/workflows/example-cucumber-tests.yml

@@ -6,8 +6,9 @@ on:
         required: true
         type: string
       cucumber-node-image:
-        required: true
+        required: false
         type: string
+        default: gitea.app.keskikuja.site/niko/ci-cucumber:latest
     secrets:
       GITEA_TOKEN:
         required: true
@@ -33,36 +34,14 @@ jobs:
           path: .ci
 
       - name: Run cucumber tests
-        id: cucumber-tests
         shell: bash
         run: |
-          mkdir -p "reports/${GITHUB_SHA:0:8}/cucumber"
-          set +e
+          mkdir -p reports/cucumber
           npx cucumber-js \
-            --format json:"reports/${GITHUB_SHA:0:8}/cucumber/report.json" \
-            --format html:"reports/${GITHUB_SHA:0:8}/cucumber/index.html" 2>&1
-          CUCUMBER_EXIT=$?
-          echo "CUCUMBER_EXIT=${CUCUMBER_EXIT}" >> "${GITHUB_ENV}"
-          exit ${CUCUMBER_EXIT}
+            --format json:reports/cucumber/report.json \
+            --format html:reports/cucumber/report.html 2>&1
 
-      - name: Publish cucumber reports
-        if: always()
-        run: bash .ci/scripts/publish-git-pages.sh cucumber
-
-      - name: Report status
+      - name: Report
         if: always()
         shell: bash
-        run: |
-          if [ "${CUCUMBER_EXIT}" = "0" ]; then
-            if [ -f "reports/${GITHUB_SHA:0:8}/cucumber/index.html" ]; then
-              bash .ci/scripts/report-status.sh success "Link to Cucumber reports" acc-tests cucumber
-            else
-              bash .ci/scripts/report-status.sh success "Link to Cucumber reports" acc-tests
-            fi
-          else
-            if [ -f "reports/${GITHUB_SHA:0:8}/cucumber/index.html" ]; then
-              bash .ci/scripts/report-status.sh failure "Link to Cucumber reports" acc-tests cucumber
-            else
-              bash .ci/scripts/report-status.sh failure "Link to Cucumber reports" acc-tests
-            fi
-          fi
+        run: bash .ci/scripts/ci-report.sh "Cucumber test report" acc-tests cucumber

.gitea/workflows/example-feature.yml

@@ -20,7 +20,6 @@ jobs:
     secrets: inherit
     with:
       env_json: ${{ needs.load-config.outputs.env_json }}
-      bats-image: gitea.app.keskikuja.site/niko/ci-bats:latest
 
   cucumber:
     name: Cucumber tests
@@ -29,7 +28,6 @@ jobs:
     secrets: inherit
     with:
       env_json: ${{ needs.load-config.outputs.env_json }}
-      cucumber-node-image: gitea.app.keskikuja.site/niko/ci-cucumber:latest
 
   report-summary:
     name: Report Summary

.gitea/workflows/example-main.yml

@@ -29,7 +29,6 @@ jobs:
     secrets: inherit
     with:
       env_json: ${{ needs.load-config.outputs.env_json }}
-      bats-image: gitea.app.keskikuja.site/niko/ci-bats:latest
 
   cucumber:
     name: Cucumber tests
@@ -39,7 +38,6 @@ jobs:
     secrets: inherit
     with:
       env_json: ${{ needs.load-config.outputs.env_json }}
-      cucumber-node-image: gitea.app.keskikuja.site/niko/ci-cucumber:latest
 
   build-push:
     name: Build & Push Docker