[CI] Re-enable Trivy scan in ci-pr.yml

Also set scan by default in ci.yml

.github/workflows/ci-pr.yml

@@ -105,9 +105,14 @@ jobs:
               -PspringBootVersion="$BOOT_VERSION" \
               -PsampleTests \
               :runAllSampleTests
+  scan:
+    needs: [prerequisites]
+    if: needs.prerequisites.outputs.runjobs
+    uses: ./.github/workflows/trivy-scan.yml
+
   done:
     runs-on: ubuntu-latest
-    needs: [ build_and_verify, check_samples ]
+    needs: [ build_and_verify, check_samples, scan ]
     steps:
       - name: 'Done'
         shell: bash

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ on:
     inputs:
       run-trivy-scan:
         description: 'Run Trivy scan ?'
-        default: false
+        default: true
         required: false
         type: boolean