Report Kosli evidence for unit and integration tests separately

.github/workflows/main.yml

@@ -164,16 +164,24 @@ jobs:
       - name: Run tests with branch-coverage
         run: |
           make test
+          
+          kosli attest junit "${IMAGE_NAME}" \
+              --name=runner.unit-test \
+              --results-dir=./test/server/reports/junit
+
           kosli attest generic "${IMAGE_NAME}" \
-              --attachments=./test/client/reports \
               --attachments=./test/server/reports \
-              --description="server & client branch-coverage" \
-              --name=runner.branch-coverage \
-              --user-data=./test/evidence.json
+              --name=runner.unit-test-branch-coverage \
+              --user-data=./test/server/reports/coverage.json
 
-#          kosli attest junit "${IMAGE_NAME}"
-#              --name=runner.unit-test
-#              --results-dir=./test/server/reports/junit
+          kosli attest junit "${IMAGE_NAME}" \
+              --name=runner.integration-test \
+              --results-dir=./test/client/reports/junit
+
+          kosli attest generic "${IMAGE_NAME}" \
+              --attachments=./test/client/reports \
+              --name=runner.integration-test-branch-coverage \
+              --user-data=./test/client/reports/coverage.json
 
 
   snyk-container-scan:

.github/workflows/main_staging.yml

@@ -135,7 +135,7 @@ jobs:
           echo "kosli_fingerprint=${FINGERPRINT}" >> ${GITHUB_OUTPUT}
 
 
-  unit-tests:
+  tests:
     needs: [wait-for-image, kosli-trail]
     runs-on: ubuntu-latest
     env:
@@ -152,16 +152,24 @@ jobs:
       - name: Run tests with branch-coverage
         run: |
           make test
+          
+          kosli attest junit "${IMAGE_NAME}" \
+              --name=runner.unit-test \
+              --results-dir=./test/server/reports/junit
+
           kosli attest generic "${IMAGE_NAME}" \
-              --attachments=./test/client/reports \
               --attachments=./test/server/reports \
-              --description="server & client branch-coverage" \
-              --name=runner.branch-coverage \
-              --user-data=./test/evidence.json
+              --name=runner.unit-test-branch-coverage \
+              --user-data=./test/server/reports/coverage.json
+          
+          kosli attest junit "${IMAGE_NAME}" \
+              --name=runner.integration-test \
+              --results-dir=./test/client/reports/junit
 
-#          kosli attest junit "${IMAGE_NAME}"
-#              --name=runner.unit-test
-#              --results-dir=test/reports/junit
+          kosli attest generic "${IMAGE_NAME}" \
+              --attachments=./test/client/reports \
+              --name=runner.integration-test-branch-coverage \
+              --user-data=./test/client/reports/coverage.json
 
 
   snyk-container-scan:
@@ -241,7 +249,7 @@ jobs:
 
 
   sdlc-control-gate:
-    needs: [unit-tests, snyk-container-scan, snyk-code-scan, kosli-trail, wait-for-image]
+    needs: [tests, snyk-container-scan, snyk-code-scan, kosli-trail, wait-for-image]
     runs-on: ubuntu-latest
     steps:
       - name: Setup Kosli CLI

.gitignore

@@ -4,5 +4,3 @@ test/client/reports/.*
 
 test/server/reports/*
 test/server/reports/.*
-
-test/evidence.json

.kosli.yml

@@ -4,7 +4,13 @@ trail:
   artifacts:
     - name: runner
       attestations:
-        - name: branch-coverage
+        - name: unit-test
+          type: junit
+        - name: unit-test-branch-coverage
+          type: generic
+        - name: integration-test
+          type: junit
+        - name: integration-test-branch-coverage
           type: generic
         - name: snyk-container-scan
           type: snyk

sh/test.sh

@@ -10,7 +10,6 @@ source "${SH_DIR}/create_test_data_manifests_file.sh"
 source "${SH_DIR}/remove_zombie_containers.sh"
 source "${SH_DIR}/setup_dependent_images.sh"
 source "${SH_DIR}/test_in_containers.sh"
-source "${SH_DIR}/write_evidence_json.sh"
 
 source "${SH_DIR}/echo_versioner_env_vars.sh"
 export $(echo_versioner_env_vars)
@@ -23,4 +22,3 @@ server_up_healthy_and_clean
 client_up_healthy_and_clean "$@"
 test_in_containers "$@"
 containers_down
-write_evidence_json "$@"