Update Sonarqube and use local image for database

BraisVQ · BraisVQ · commit 33f79cf14935 · 2025-05-30T14:46:04.000+02:00
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        version: ['10.8.0'] # 9.9 = LTS
+        version: ['2025.1.1'] # 2025.1.1 = LTS
         edition: ['developer', 'enterprise']
     steps:
       -
@@ -66,6 +66,21 @@ jobs:
         run: |
           cd sonarqube && ./test.sh --sq-version=${{ matrix.version }} --sq-edition=${{ matrix.edition }}
 
+  sonarqube-postgresql:
+    name: SonarQube PostgreSQL tests
+    runs-on: ubuntu-22.04
+    steps:
+      -
+        name: Checkout repository
+        uses: actions/checkout@v4.2.2
+      -
+        name: Build docker image
+        run: |
+          ./.github/workflows/build-docker-image.sh \
+          --imagename ods-sonarqube-postgresql \
+          --dockerdir sonarqube/docker \
+          --dockerfile Dockerfile.database
+
   nexus:
     name: Nexus tests
     runs-on: ubuntu-22.04
diff --git a/configuration-sample/ods-core.env.sample b/configuration-sample/ods-core.env.sample
@@ -133,7 +133,7 @@ SONAR_SAML_CERTIFICATE_B64=changeme
 # your SonarQube version, see https://docs.sonarqube.org/latest/requirements/requirements/.
 # Take care when upgrading either database or SQ version.
 # E.g. registry.redhat.io/rhel9/postgresql-15
-SONAR_DATABASE_IMAGE=docker-registry.default.svc:5000/openshift/postgresql:15
+SONAR_DATABASE_IMAGE=registry.redhat.io/rhel9/postgresql-15
 # Connection string for JDBC. Typically this does not need to be changed.
 SONAR_DATABASE_JDBC_URL=jdbc:postgresql://sonarqube-postgresql:5432/sonarqube
 # Database name for SonarQube. Typically this does not need to be changed.
@@ -151,8 +151,8 @@ SONAR_EDITION=developer
 # SonarQube version.
 # See Dockerhub https://hub.docker.com/_/sonarqube/tags
 # Officially supported is:
-# - 10.8.0
-SONAR_VERSION=10.8.0
+# - 2025.1.1
+SONAR_VERSION=2025.1.1
 
 # SonarQube memory and CPU resources
 SONARQUBE_CPU_REQUEST=200m
diff --git a/jenkins/agent-base/Dockerfile.ubi8 b/jenkins/agent-base/Dockerfile.ubi8
@@ -2,8 +2,8 @@ FROM quay.io/openshift/origin-jenkins-agent-base
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-ENV SONAR_SCANNER_VERSION=6.2.1.4610 \
-    CNES_REPORT_VERSION=5.0.0 \
+ENV SONAR_SCANNER_VERSION=7.0.2.4839 \
+    CNES_REPORT_VERSION=5.0.1 \
     COSIGN_VERSION=2.4.3 \
     TAILOR_VERSION=1.3.4 \
     SOPS_VERSION=3.9.0 \
diff --git a/jenkins/master/plugins.ubi8.txt b/jenkins/master/plugins.ubi8.txt
@@ -1,6 +1,6 @@
 # Aditional plugins
 greenballs:1.15.1
-sonar:2.17.2
+sonar:2.18
 ansicolor:1.0.4
 audit-trail:361.v82cde86c784e
 Office-365-Connector:5.0.0
diff --git a/sonarqube/chart/Chart.yaml b/sonarqube/chart/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.1
+version: 1.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "10.8.0"
+appVersion: "2025.1.1"
diff --git a/sonarqube/chart/templates/buildconfig-postgresql.yaml b/sonarqube/chart/templates/buildconfig-postgresql.yaml
@@ -0,0 +1,40 @@
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  labels:
+    app: {{ .Values.global.appName }}
+  name: {{ .Values.global.appName }}-postgresql
+spec:
+  failedBuildsHistoryLimit: 5
+  nodeSelector: null
+  output:
+    to:
+      kind: ImageStreamTag
+      name: {{ printf "%s-postgresql:%s" .Values.global.appName .Values.global.odsImageTag }}
+  postCommit: {}
+  resources:
+    limits:
+      cpu: {{ .Values.buildConfig.cpuLimit }}
+      memory: {{ .Values.buildConfig.memLimit }}
+    requests:
+      cpu: {{ .Values.buildConfig.cpuRequest }}
+      memory: {{ .Values.buildConfig.memRequest }}
+  runPolicy: Serial
+  source:
+    contextDir: sonarqube/docker
+    git:
+      uri: {{ .Values.global.repoBase }}/{{ .Values.global.odsBitBucketProject }}/ods-core.git
+      ref: {{ .Values.global.odsGitRef }}
+    sourceSecret:
+      name: cd-user-token
+    type: Git
+  strategy:
+    type: Docker
+    dockerStrategy:
+      dockerfilePath: Dockerfile.database
+      from:
+        kind: DockerImage
+        name: {{ .Values.global.sonarDatabaseImage}}
+      forcePull: true
+      noCache: true
+  successfulBuildsHistoryLimit: 5
diff --git a/sonarqube/chart/templates/buildconfig-sonarqube.yaml b/sonarqube/chart/templates/buildconfig-sonarqube.yaml
diff --git a/sonarqube/chart/templates/dc-postgresql.yaml b/sonarqube/chart/templates/dc-postgresql.yaml
@@ -40,7 +40,7 @@ spec:
             configMapKeyRef:
               key: database-name
               name: {{ .Values.global.appName }}
-        image: {{ .Values.global.sonarDatabaseImage}}
+        image: {{ .Values.global.registry }}/{{ .Values.global.odsNamespace }}/{{ .Values.global.appName }}-postgresql:{{ .Values.global.odsImageTag }}
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -98,4 +98,13 @@ spec:
           claimName: {{ .Values.global.appName }}-postgresql-backup
   test: false
   triggers:
-  - type: ConfigChange
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+        - {{ .Values.global.appName }}-postgresql
+        from:
+          kind: ImageStreamTag
+          name: {{ .Values.global.appName }}-postgresql:{{ .Values.global.odsImageTag }}
+          namespace: {{ .Values.global.odsNamespace }}
+      type: ImageChange
+    - type: ConfigChange
diff --git a/sonarqube/chart/templates/imagestream-postgresql.yaml b/sonarqube/chart/templates/imagestream-postgresql.yaml
@@ -0,0 +1,9 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    app: {{ .Values.global.appName }}
+  name: {{ .Values.global.appName }}-postgresql
+spec:
+  lookupPolicy:
+    local: false
diff --git a/sonarqube/chart/templates/imagestream-sonarqube.yaml b/sonarqube/chart/templates/imagestream-sonarqube.yaml
diff --git a/sonarqube/docker/Dockerfile b/sonarqube/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN mkdir -p /opt/configuration/sonarqube/plugins
 # Language plugins not bundled
 ADD https://github.com/Inform-Software/sonar-groovy/releases/download/1.8/sonar-groovy-plugin-1.8.jar /opt/configuration/sonarqube/plugins/
 ADD https://github.com/Merck/sonar-r-plugin/releases/download/0.2.2/sonar-r-plugin-0.2.2.jar /opt/configuration/sonarqube/plugins/
-ADD https://github.com/elegoff/sonar-rust/releases/download/v0.2.5/community-rust-plugin-0.2.5.jar /opt/configuration/sonarqube/plugins/
+ADD https://github.com/C4tWithShell/community-rust/releases/download/v0.2.6/community-rust-plugin-0.2.6.jar /opt/configuration/sonarqube/plugins/
 
 COPY run.sh $SONARQUBE_HOME/bin/
 
diff --git a/sonarqube/docker/Dockerfile.database b/sonarqube/docker/Dockerfile.database
@@ -0,0 +1 @@
+FROM public.ecr.aws/docker/library/postgres:15-alpine
diff --git a/sonarqube/test.sh b/sonarqube/test.sh
@@ -6,14 +6,14 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ODS_CORE_DIR=${SCRIPT_DIR%/*}
 ODS_CONFIGURATION_DIR="${ODS_CORE_DIR}/../ods-configuration"
 
-SONAR_VERSION=10.8.0
+SONAR_VERSION=2025.1.1
 SONAR_EDITION="developer"
 
 function usage {
     printf "Test SonarQube setup.\n\n"
     printf "\t-h|--help\t\tPrint usage\n"
     printf "\t-v|--verbose\t\tEnable verbose mode\n"
-    printf "\t-s|--sq-version\t\tSonarQube version, e.g. '10.8.0' (defaults to %s)\n" "${SONAR_VERSION}"
+    printf "\t-s|--sq-version\t\tSonarQube version, e.g. '2025.1.1' (defaults to %s)\n" "${SONAR_VERSION}"
     printf "\t-e|--sq-edition\t\tSonarQube edition, e.g. 'community' or 'enterprise' (defaults to %s)\n" "${SONAR_EDITION}"
     printf "\t-i|--insecure\t\tAllow insecure server connections when using SSL\n"
     printf "\t--verify\t\tSkips setup of local docker container and instead checks existing sonarqube setup based on ods-core.env\n"
@@ -191,7 +191,7 @@ case $SONAR_EDITION in
     community | developer | enterprise | datacenter)
         expectedPlugins=("groovy:1.8"
                 "r:0.2.2"
-                "communityrust:0.2.5" )
+                "communityrust:0.2.6" )
         ;;
 
     *)
