From 2687cec6489979ff1205009180d63348e98c388c Mon Sep 17 00:00:00 2001 From: Davi Koscianski Vidal Date: Thu, 2 Jan 2025 17:27:16 +0100 Subject: [PATCH] SONAR-23852 Creates new version structure --- .cirrus/tasks.yml | 41 +++++++++++---------- .github/workflows/release.yml | 16 ++++---- {10 => 2025.1}/datacenter/app/Dockerfile | 2 +- {10 => 2025.1}/datacenter/app/run.sh | 0 {10 => 2025.1}/datacenter/app/sonar.sh | 0 {10 => 2025.1}/datacenter/search/Dockerfile | 2 +- {10 => 2025.1}/datacenter/search/run.sh | 0 {10 => 2025.1}/datacenter/search/sonar.sh | 0 {10 => 2025.1}/developer/Dockerfile | 2 +- {10 => 2025.1}/developer/entrypoint.sh | 0 {10 => 2025.1}/enterprise/Dockerfile | 2 +- {10 => 2025.1}/enterprise/entrypoint.sh | 0 community-build/Dockerfile | 2 +- sonar-project.properties | 2 +- 14 files changed, 35 insertions(+), 34 deletions(-) rename {10 => 2025.1}/datacenter/app/Dockerfile (95%) rename {10 => 2025.1}/datacenter/app/run.sh (100%) rename {10 => 2025.1}/datacenter/app/sonar.sh (100%) rename {10 => 2025.1}/datacenter/search/Dockerfile (95%) rename {10 => 2025.1}/datacenter/search/run.sh (100%) rename {10 => 2025.1}/datacenter/search/sonar.sh (100%) rename {10 => 2025.1}/developer/Dockerfile (95%) rename {10 => 2025.1}/developer/entrypoint.sh (100%) rename {10 => 2025.1}/enterprise/Dockerfile (95%) rename {10 => 2025.1}/enterprise/entrypoint.sh (100%) diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml index 9a285eeca..66d77aa61 100644 --- a/.cirrus/tasks.yml +++ b/.cirrus/tasks.yml @@ -18,6 +18,7 @@ env: CURRENT_LTA_VERSION: 9.9.7 CURRENT_VERSION: 10.8.1 NEXT_VERSION: 2025.1 + # Must be in the format YY.MM.0.###### where ###### is the build number COMMUNITY_BUILD_VERSION: 24.12.0.100206 @@ -62,9 +63,9 @@ multi_arch_build_gcp_staging_task: only_if: $CIRRUS_CRON == 'nightly-mend-scan' || $TRIGGER == 'PUSH_GCP_STAGING_IMAGES' env: matrix: - - version: 10/datacenter/app + - version: 2025.1/datacenter/app STAGING_IMAGE_NAME: ${GCLOUD_STAGING_REGISTRY}/${GCLOUD_STAGING_PRODUCT_NAME} - - version: 10/datacenter/search + - version: 2025.1/datacenter/search STAGING_IMAGE_NAME: ${GCLOUD_STAGING_REGISTRY}/${GCLOUD_STAGING_PRODUCT_NAME}/sonarqube-dce-search ec2_instance: <<: *VM_TEMPLATE @@ -112,19 +113,19 @@ multi_arch_build_9_x_task: - version: 9/datacenter/search tag: $CURRENT_LTA_VERSION-datacenter-search -multi_arch_build_10_x_task: +multi_arch_build_2025_x_task: <<: *multi_arch_build_task_template - skip: "!changesInclude('10/**/*') && !changesInclude('.cirrus/*')" + skip: "!changesInclude('${NEXT_VERSION}/**/*') && !changesInclude('.cirrus/*')" env: matrix: - - version: 10/developer - tag: $NEXT_VERSION-developer - - version: 10/enterprise - tag: $NEXT_VERSION-enterprise - - version: 10/datacenter/app - tag: $NEXT_VERSION-datacenter-app - - version: 10/datacenter/search - tag: $NEXT_VERSION-datacenter-search + - version: ${NEXT_VERSION}/developer + tag: ${NEXT_VERSION}-developer + - version: ${NEXT_VERSION}/enterprise + tag: ${NEXT_VERSION}-enterprise + - version: ${NEXT_VERSION}/datacenter/app + tag: ${NEXT_VERSION}-datacenter-app + - version: ${NEXT_VERSION}/datacenter/search + tag: ${NEXT_VERSION}-datacenter-search multi_arch_build_community_build_task: <<: *multi_arch_build_task_template @@ -141,7 +142,7 @@ private_scan_task: WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent matrix: - tag: $CURRENT_LTA_VERSION-datacenter-app - - tag: $NEXT_VERSION-datacenter-app + - tag: ${NEXT_VERSION}-datacenter-app ec2_instance: <<: *CI_SCANNER login_script: @@ -153,7 +154,7 @@ private_scan_task: - java -jar /usr/local/bin/wss-unified-agent.jar -c .cirrus/wss-unified-agent.config -apiKey $MEND_API_KEY -product ${WS_PRODUCTNAME} -project ${STAGING_IMAGE_NAME}:${tag} -wss.url ${WS_WSS_URL} -docker.scanImages true depends_on: - multi_arch_build_9_x - - multi_arch_build_10_x + - multi_arch_build_2025_x_task public_scan_task: only_if: $CIRRUS_CRON == 'nightly-mend-scan' @@ -211,9 +212,9 @@ multi_arch_test_9_x_task: tag: $CURRENT_LTA_VERSION-datacenter depends_on: multi_arch_build_9_x -multi_arch_test_10_x_task: +multi_arch_test_2025_x_task: <<: *multi_arch_test_task_template - skip: "!changesInclude('10/**/*') && !changesInclude('.cirrus/*')" + skip: "!changesInclude('${NEXT_VERSION}/**/*') && !changesInclude('.cirrus/*')" matrix: - env: CIRRUS_ARCH: arm64 @@ -226,12 +227,12 @@ multi_arch_test_10_x_task: env: matrix: - test_name: docker - tag: $NEXT_VERSION-developer + tag: ${NEXT_VERSION}-developer - test_name: docker - tag: $NEXT_VERSION-enterprise + tag: ${NEXT_VERSION}-enterprise - test_name: docker-compose - tag: $NEXT_VERSION-datacenter - depends_on: multi_arch_build_10_x + tag: ${NEXT_VERSION}-datacenter + depends_on: multi_arch_build_2025_x_task multi_arch_test_community_build_task: <<: *multi_arch_test_task_template diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8232205df..ace659f9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: uses: ./.github/workflows/release-template.yml with: tag: ${{ matrix.tag }} - release-10-x: - name: Upload Release Assets for 10-X releases - if: contains(github.event.release.name, '10.') + release-2025-x: + name: Upload Release Assets for 2025.X releases + if: contains(github.event.release.name, '2025.') permissions: contents: write id-token: write @@ -34,10 +34,10 @@ jobs: fail-fast: false matrix: tag: - - 10-developer - - 10-enterprise - - 10-datacenter-app - - 10-datacenter-search + - 2025-developer + - 2025-enterprise + - 2025-datacenter-app + - 2025-datacenter-search uses: ./.github/workflows/release-template.yml with: tag: ${{ matrix.tag }} @@ -54,4 +54,4 @@ jobs: - community uses: ./.github/workflows/release-template.yml with: - tag: ${{ matrix.tag }} \ No newline at end of file + tag: ${{ matrix.tag }} diff --git a/10/datacenter/app/Dockerfile b/2025.1/datacenter/app/Dockerfile similarity index 95% rename from 10/datacenter/app/Dockerfile rename to 2025.1/datacenter/app/Dockerfile index 4130dfcd2..5f72b20a9 100644 --- a/10/datacenter/app/Dockerfile +++ b/2025.1/datacenter/app/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jre-noble -LABEL io.k8s.description="SonarQube is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." +LABEL io.k8s.description="SonarQube Server is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." LABEL io.openshift.min-cpu=400m LABEL io.openshift.min-memory=2048M LABEL io.openshift.non-scalable=false diff --git a/10/datacenter/app/run.sh b/2025.1/datacenter/app/run.sh similarity index 100% rename from 10/datacenter/app/run.sh rename to 2025.1/datacenter/app/run.sh diff --git a/10/datacenter/app/sonar.sh b/2025.1/datacenter/app/sonar.sh similarity index 100% rename from 10/datacenter/app/sonar.sh rename to 2025.1/datacenter/app/sonar.sh diff --git a/10/datacenter/search/Dockerfile b/2025.1/datacenter/search/Dockerfile similarity index 95% rename from 10/datacenter/search/Dockerfile rename to 2025.1/datacenter/search/Dockerfile index af20d3ed9..0b571f4fe 100644 --- a/10/datacenter/search/Dockerfile +++ b/2025.1/datacenter/search/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jre-noble -LABEL io.k8s.description="SonarQube is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." +LABEL io.k8s.description="SonarQube Server is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." LABEL io.openshift.min-cpu=400m LABEL io.openshift.min-memory=2048M LABEL io.openshift.non-scalable=false diff --git a/10/datacenter/search/run.sh b/2025.1/datacenter/search/run.sh similarity index 100% rename from 10/datacenter/search/run.sh rename to 2025.1/datacenter/search/run.sh diff --git a/10/datacenter/search/sonar.sh b/2025.1/datacenter/search/sonar.sh similarity index 100% rename from 10/datacenter/search/sonar.sh rename to 2025.1/datacenter/search/sonar.sh diff --git a/10/developer/Dockerfile b/2025.1/developer/Dockerfile similarity index 95% rename from 10/developer/Dockerfile rename to 2025.1/developer/Dockerfile index 2333c654b..89165f3be 100644 --- a/10/developer/Dockerfile +++ b/2025.1/developer/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jre-noble -LABEL io.k8s.description="SonarQube is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." +LABEL io.k8s.description="SonarQube Server is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." LABEL io.openshift.min-cpu=400m LABEL io.openshift.min-memory=2048M LABEL io.openshift.non-scalable=true diff --git a/10/developer/entrypoint.sh b/2025.1/developer/entrypoint.sh similarity index 100% rename from 10/developer/entrypoint.sh rename to 2025.1/developer/entrypoint.sh diff --git a/10/enterprise/Dockerfile b/2025.1/enterprise/Dockerfile similarity index 95% rename from 10/enterprise/Dockerfile rename to 2025.1/enterprise/Dockerfile index e85440e08..2ed554202 100644 --- a/10/enterprise/Dockerfile +++ b/2025.1/enterprise/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jre-noble -LABEL io.k8s.description="SonarQube is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." +LABEL io.k8s.description="SonarQube Server is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." LABEL io.openshift.min-cpu=400m LABEL io.openshift.min-memory=2048M LABEL io.openshift.non-scalable=true diff --git a/10/enterprise/entrypoint.sh b/2025.1/enterprise/entrypoint.sh similarity index 100% rename from 10/enterprise/entrypoint.sh rename to 2025.1/enterprise/entrypoint.sh diff --git a/community-build/Dockerfile b/community-build/Dockerfile index 8d978726f..e1f85c3c3 100644 --- a/community-build/Dockerfile +++ b/community-build/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jre-noble -LABEL io.k8s.description="SonarQube is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." +LABEL io.k8s.description="SonarQube Community Build is a self-managed, automatic code review tool that systematically helps you deliver Clean Code." LABEL io.openshift.min-cpu=400m LABEL io.openshift.min-memory=2048M LABEL io.openshift.non-scalable=true diff --git a/sonar-project.properties b/sonar-project.properties index efed665b6..4eb364cde 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,3 +1,3 @@ sonar.projectKey=SonarSource_docker-sonarqube_AYcnOvlJTpBOcQuGEdI5 -sonar.sources=9/,10/ +sonar.sources=9/,2025.1/ sonar.organization=sonarsource