CI: improve ci and SonarQube for kfs kalisio/development#6

Author: scolbert-lisbona-kalisio

.github/workflows/main.yaml

@@ -1,10 +1,31 @@
 name: ci
-on: [ push, workflow_dispatch ]
+on:
+  push:
+  workflow_dispatch:
+    inputs:
+      build_service:
+        description: "Build service"
+        default: false
+        required: false
+        type: boolean
+      run_tests:
+        description: "Run tests"
+        default: false
+        required: false
+        type: boolean
+      additional_tests:
+        description: "Additional tests"
+        default: false
+        required: false
+        type: boolean
 
 jobs:
   run_tests:
     name: Run tests
-    if: ${{ !contains(github.event.head_commit.message, 'skip tests') }}
+    if: ${{
+      github.event_name == 'workflow_dispatch' && inputs.run_tests ||
+      github.event_name == 'push' && !contains(github.event.head_commit.message, 'skip tests') 
+      }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
@@ -20,14 +41,14 @@ jobs:
       - name: Run tests
         env:
           SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
-        run: bash ./scripts/run_tests.sh -r ${{ github.job }}
+        run: bash ./scripts/run_tests.sh -s -r ${{ github.job }}
 
   additional_tests:
     strategy:
       fail-fast: false
       matrix:
-        node: [ 22 ]
-        mongo: [ 7 ]
+        node: [ 20, 22 ]
+        mongo: [ 7, 8 ]
     name: Additional tests
     if: ${{ contains(github.event.head_commit.message, 'additional tests') }}
     runs-on: ubuntu-22.04

README.md

@@ -2,8 +2,8 @@
 
 [![Latest Release](https://img.shields.io/github/v/tag/kalisio/kfs?sort=semver&label=latest)](https://github.com/kalisio/kfs/releases)
 [![CI](https://github.com/kalisio/kfs/actions/workflows/main.yaml/badge.svg)](https://github.com/kalisio/kfs/actions/workflows/main.yaml)
-[![Code Climate](https://codeclimate.com/github/kalisio/kfs/badges/gpa.svg)](https://codeclimate.com/github/kalisio/kfs)
-[![Test Coverage](https://codeclimate.com/github/kalisio/kfs/badges/coverage.svg)](https://codeclimate.com/github/kalisio/kfs/coverage)
+[![Maintainability Issues](https://sonar.portal.kalisio.com/api/project_badges/measure?project=kalisio-kfs&metric=software_quality_maintainability_issues&token=sqb_3e3da8c91abe98896640284af9eb2a3672897d94)](https://sonar.portal.kalisio.com/dashboard?id=kalisio-kfs)
+[![Coverage](https://sonar.portal.kalisio.com/api/project_badges/measure?project=kalisio-kfs&metric=coverage&token=sqb_3e3da8c91abe98896640284af9eb2a3672897d94)](https://sonar.portal.kalisio.com/dashboard?id=kalisio-kfs)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 **Kalisio Features Service**

scripts/init_runner.sh

@@ -16,7 +16,7 @@ init_github_run_tests() {
 }
 
 init_github_additional_tests() {
-    install_reqs age sops nvm node22 mongo7
+    install_reqs age sops nvm node20 node22 mongo7 mongo8
 }
 
 init_github_build_service() {

scripts/run_tests.sh

@@ -15,17 +15,17 @@ WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
 NODE_VER=20
 MONGO_VER=7
 CI_STEP_NAME="Run tests"
-CODE_COVERAGE=false
-while getopts "m:n:cr:" option; do
+RUN_SONAR=false
+while getopts "m:n:sr:" option; do
     case $option in
         m) # defines mongo version
             MONGO_VER=$OPTARG
             ;;
         n) # defines node version
             NODE_VER=$OPTARG
              ;;
-        c) # publish code coverage
-            CODE_COVERAGE=true
+        s) # enable SonarQube analysis and publish code quality & coverage results
+            RUN_SONAR=true
             ;;
         r) # report outcome to slack
             load_env_files "$WORKSPACE_DIR/development/common/SLACK_WEBHOOK_SERVICES.enc.env"
@@ -45,6 +45,4 @@ done
 ## Run tests
 ##
 
-run_lib_tests "$ROOT_DIR" "$CODE_COVERAGE" "$NODE_VER" "$MONGO_VER"
-
-cd "$ROOT_DIR" && sonar-scanner
+run_lib_tests "$ROOT_DIR" "$RUN_SONAR" "$NODE_VER" "$MONGO_VER"