Split artifacts in two archives and improve timeout counting

Author: cmd-ntrf

.github/workflows/incus.yaml

@@ -55,11 +55,14 @@ jobs:
           bash utils/incus_report.sh >> $GITHUB_STEP_SUMMARY
       - name: Recover artifacts from containers
         run: |
-          mkdir artifacts
-          cd artifacts/
-          bash ../utils/incus_artifacts.sh
-      - name: 'Upload Artifacts'
+          bash utils/incus_artifacts.sh
+      - name: 'Upload puppet reports'
         uses: actions/upload-artifact@v6
         with:
-          name: puppet-apply-artifacts
-          path: artifacts/*
+          name: puppet-reports
+          path: '*.prom'
+      - name: 'Upload puppet journals'
+        uses: actions/upload-artifact@v6
+        with:
+          name: puppet-reports
+          path: '*.json'

utils/incus_report.sh

@@ -12,7 +12,7 @@ echo
 for nodename in $(incus list -c n -f csv); do
 	echo -n "### ${nodename}" 
 	failures=$(incus exec ${puppet_server} -- grep 'name="Failure"' /var/lib/node_exporter/puppet_report_${nodename}.prom | cut -d' ' -f2)
-	timeout=$(incus exec $nodename -- journalctl -u puppet -p3..4 | grep -i 'command exceeded timeout' | wc -l)
+	timeout=$(incus exec $nodename -- journalctl -u puppet -p3..3 | grep -i 'command exceeded timeout' | grep -o "([^)]*)" | sort | uniq | wc -l)
 	if (( $failures - $timeout > 0 )); then
 		echo " FAILED"
 		cat <<- EOF