From 2e92be5e1904da82e93c97fa59e7b9575339dd7e Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP)" Date: Mon, 28 Oct 2024 17:48:28 +0100 Subject: [PATCH 1/2] update SonarQube to version 10.7 --- .github/workflows/continuous-integration-workflow.yml | 2 +- CHANGELOG.md | 3 ++- sonarqube/chart/Chart.yaml | 2 +- sonarqube/docker/Dockerfile | 2 +- sonarqube/test.sh | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 2d5d0942a..7f799fa88 100644 --- 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.6.0'] # 9.9 = LTS + version: ['10.7.0'] # 9.9 = LTS edition: ['community', 'developer', 'enterprise'] steps: - diff --git a/CHANGELOG.md b/CHANGELOG.md index ccaf925ac..1496d7fe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,9 @@ ### Changed - Webhook Proxy maintenance ([#1298](https://github.com/opendevstack/ods-core/pull/1298)) -- Update SonarQube to 10.x non LTS ([#1300](https://github.com/opendevstack/ods-core/issues/1300)) +- Update SonarQube to 10.6 non LTS ([#1300](https://github.com/opendevstack/ods-core/issues/1300)) - Jenkins maintenance ([#1299](https://github.com/opendevstack/ods-core/pull/1299)) and update java version in Jenkins ([#1295](https://github.com/opendevstack/ods-core/issues/1295)) +- Update SonarQube to 10.7 non LTS ([#1298](https://github.com/opendevstack/ods-core/pull/1309)) ### Fixed diff --git a/sonarqube/chart/Chart.yaml b/sonarqube/chart/Chart.yaml index 8f7167d65..88fae2ab1 100644 --- a/sonarqube/chart/Chart.yaml +++ b/sonarqube/chart/Chart.yaml @@ -21,4 +21,4 @@ version: 1.1.1 # 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.6.0" +appVersion: "10.7.0" diff --git a/sonarqube/docker/Dockerfile b/sonarqube/docker/Dockerfile index 61eb95567..47749e44e 100644 --- a/sonarqube/docker/Dockerfile +++ b/sonarqube/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG sonarVersion=10.6.0 +ARG sonarVersion=10.7.0 ARG sonarEdition=community FROM sonarqube:${sonarVersion}-${sonarEdition} diff --git a/sonarqube/test.sh b/sonarqube/test.sh index 3d3ae86fe..084401b42 100755 --- 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.6.0 +SONAR_VERSION=10.7.0 SONAR_EDITION="community" 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.6.0' (defaults to %s)\n" "${SONAR_VERSION}" + printf "\t-s|--sq-version\t\tSonarQube version, e.g. '10.7.0' (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" From 09b7b9750dc670636379181522a260eb0e14cf1f Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP)" Date: Tue, 29 Oct 2024 10:19:29 +0100 Subject: [PATCH 2/2] update config for sonar 10.7 --- configuration-sample/ods-core.env.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration-sample/ods-core.env.sample b/configuration-sample/ods-core.env.sample index 2dd4454cc..23cba7a2f 100644 --- a/configuration-sample/ods-core.env.sample +++ b/configuration-sample/ods-core.env.sample @@ -134,8 +134,8 @@ SONAR_EDITION=community # SonarQube version. # See Dockerhub https://hub.docker.com/_/sonarqube/tags # Officially supported is: -# - 10.6.0 -SONAR_VERSION=10.6.0 +# - 10.7.0 +SONAR_VERSION=10.7.0 # SonarQube memory and CPU resources SONARQUBE_CPU_REQUEST=200m