From 15c883e44a161e76a47acb6b4b630b872940a808 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 7 Oct 2025 08:59:44 +0200 Subject: [PATCH 1/3] ci: remove sonarqube (#18273) this service will be decommissioned shortly (cherry picked from commit cbef0782e5210939c990d0b1cdde277cb3b8b066) # Conflicts: # .buildkite/pull_request_pipeline.yml --- .buildkite/aarch64_pipeline.yml | 3 - .buildkite/pull_request_pipeline.yml | 144 +++++++++++++++++- .../jdk-matrix-tests/generate-steps.py | 1 - ci/unit_tests.sh | 10 +- logstash-core/build.gradle | 8 - sonar-project.properties | 12 -- 6 files changed, 143 insertions(+), 35 deletions(-) delete mode 100644 sonar-project.properties diff --git a/.buildkite/aarch64_pipeline.yml b/.buildkite/aarch64_pipeline.yml index 3ab0e7ce1e3..e99b8383755 100644 --- a/.buildkite/aarch64_pipeline.yml +++ b/.buildkite/aarch64_pipeline.yml @@ -23,9 +23,6 @@ steps: - label: ":java: Java unit tests" key: "java-unit-tests" - env: - # https://github.com/elastic/logstash/pull/15486 for background - ENABLE_SONARQUBE: "false" command: | set -euo pipefail diff --git a/.buildkite/pull_request_pipeline.yml b/.buildkite/pull_request_pipeline.yml index 7ee9984d59f..345a64951fe 100644 --- a/.buildkite/pull_request_pipeline.yml +++ b/.buildkite/pull_request_pipeline.yml @@ -49,8 +49,6 @@ steps: retry: automatic: - limit: 3 - env: - ENABLE_SONARQUBE: true command: | set -euo pipefail source .buildkite/scripts/common/container-agent.sh @@ -60,6 +58,7 @@ steps: - "**/jacocoTestReport.xml" - "**/build/classes/**/*.*" +<<<<<<< HEAD - label: ":sonarqube: Continuous Code Inspection" if: | build.pull_request.id != null || @@ -80,6 +79,147 @@ steps: retry: manual: allowed: true +======= + - label: ":java: Java unit tests - FIPS mode" + key: "java-unit-tests-fips" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + + docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . + docker run test-runner-image ./gradlew --info --stacktrace -PfedrampHighMode=true javaTests + artifact_paths: + - "**/build/test-results/javaTests/TEST-*.xml" + - "**/jacocoTestReport.xml" + - "**/build/classes/**/*.*" + + - label: "Observability SRE container smoke test" + key: "observability-sre-container-smoke-test" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + source .buildkite/scripts/common/vm-agent.sh + export ARCH="x86_64" + ./ci/observabilitySREsmoke_tests.sh + + - label: ":lab_coat: Integration Tests - FIPS mode / part 1-of-6" + key: "integration-tests-fips-part-1-of-6" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + + docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . + docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 0 6 + + - label: ":lab_coat: Integration Tests - FIPS mode / part 2-of-6" + key: "integration-tests-fips-part-2-of-6" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + + docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . + docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 1 6 + + - label: ":lab_coat: Integration Tests - FIPS mode / part 3-of-6" + key: "integration-tests-fips-part-3-of-6" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + + docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . + docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 2 6 + + - label: ":lab_coat: Integration Tests - FIPS mode / part 4-of-6" + key: "integration-tests-fips-part-4-of-6" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + + docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . + docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 3 6 + + - label: ":lab_coat: Integration Tests - FIPS mode / part 5-of-6" + key: "integration-tests-fips-part-5-of-6" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + + docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . + docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 4 6 + + - label: ":lab_coat: Integration Tests - FIPS mode / part 6-of-6" + key: "integration-tests-fips-part-6-of-6" + agents: + provider: gcp + imageProject: elastic-images-prod + image: family/platform-ingest-logstash-ubuntu-2204 + machineType: "n2-standard-4" + diskSizeGb: 64 + retry: + automatic: + - limit: 3 + command: | + set -euo pipefail + + docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . + docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 5 6 +>>>>>>> cbef0782 (ci: remove sonarqube (#18273)) - label: ":lab_coat: Integration Tests / part 1-of-6" key: "integration-tests-part-1-of-6" diff --git a/.buildkite/scripts/jdk-matrix-tests/generate-steps.py b/.buildkite/scripts/jdk-matrix-tests/generate-steps.py index cbb4900354b..f8e50149a38 100644 --- a/.buildkite/scripts/jdk-matrix-tests/generate-steps.py +++ b/.buildkite/scripts/jdk-matrix-tests/generate-steps.py @@ -229,7 +229,6 @@ def java_unit_test(self) -> JobRetValues: step_name_human = "Java Unit Test" step_key = f"{self.group_key}-java-unit-test" test_command = ''' -export ENABLE_SONARQUBE="false" ci/unit_tests.sh java ''' diff --git a/ci/unit_tests.sh b/ci/unit_tests.sh index 82a670b071e..d7a760d693e 100755 --- a/ci/unit_tests.sh +++ b/ci/unit_tests.sh @@ -10,8 +10,6 @@ export GRADLE_OPTS="-Xmx4g -Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false export SPEC_OPTS="--order rand --format documentation" export CI=true export TEST_DEBUG=true -# don't rely on bash booleans for truth checks, since some CI platforms don't have a way to specify env vars as boolean -export ENABLE_SONARQUBE=${ENABLE_SONARQUBE:-"true"} if [ -n "$BUILD_JAVA_HOME" ]; then GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME" @@ -19,15 +17,9 @@ fi SELECTED_TEST_SUITE=$1 -SONAR_ARGS=() -if [[ $(echo $ENABLE_SONARQUBE | tr '[:lower:]' '[:upper:]') == "TRUE" ]]; then - SONAR_ARGS=("jacocoTestReport") - export COVERAGE=true -fi - if [[ $SELECTED_TEST_SUITE == $"java" ]]; then echo "Running Java Tests" - ./gradlew javaTests "${SONAR_ARGS[@]}" --console=plain --warning-mode all + ./gradlew javaTests --console=plain --warning-mode all elif [[ $SELECTED_TEST_SUITE == $"ruby" ]]; then echo "Running Ruby unit tests" ./gradlew rubyTests --console=plain --warning-mode all diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle index 14dd90e8199..735d51ba21d 100644 --- a/logstash-core/build.gradle +++ b/logstash-core/build.gradle @@ -23,22 +23,14 @@ buildscript { plugins { id "jacoco" - id "org.sonarqube" version "4.3.0.3225" } apply plugin: 'jacoco' -apply plugin: "org.sonarqube" repositories { mavenCentral() } -sonarqube { - properties { - property 'sonar.coverage.jacoco.xmlReportPaths', "${buildDir}/reports/jacoco/test/jacocoTestReport.xml" - } -} - jacoco { toolVersion = "0.8.9" } diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index d95e9fcc176..00000000000 --- a/sonar-project.properties +++ /dev/null @@ -1,12 +0,0 @@ -sonar.projectKey=elastic_logstash_AYm_nEbQaV3I-igkX1q9 -sonar.host.url=https://sonar.elastic.dev - -sonar.exclusions=vendor/**, gradle/**, rakelib/**, logstash-core-plugin-api/**, licenses/**, qa/**, **/spec/** -sonar.tests=logstash-core/src/test, x-pack/src/test, buildSrc/src/test - -# Ruby -sonar.ruby.coverage.reportPaths=coverage/coverage.json - -# Java -sonar.coverage.jacoco.xmlReportPaths=**/jacocoTestReport.xml -sonar.java.binaries=**/build/classes \ No newline at end of file From 250cb888cd5b96554bc812fe759640ab8dc3101a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 7 Oct 2025 09:03:31 +0200 Subject: [PATCH 2/3] fix --- .buildkite/pull_request_pipeline.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/.buildkite/pull_request_pipeline.yml b/.buildkite/pull_request_pipeline.yml index 345a64951fe..05bda398c8b 100644 --- a/.buildkite/pull_request_pipeline.yml +++ b/.buildkite/pull_request_pipeline.yml @@ -58,28 +58,6 @@ steps: - "**/jacocoTestReport.xml" - "**/build/classes/**/*.*" -<<<<<<< HEAD - - label: ":sonarqube: Continuous Code Inspection" - if: | - build.pull_request.id != null || - build.branch == "main" || - build.branch =~ /^[0-9]+\.[0-9]+\$/ - env: - VAULT_SONAR_TOKEN_PATH: "kv/ci-shared/platform-ingest/elastic/logstash/sonar-analyze-token" - agents: - image: "docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest" - command: - - "buildkite-agent artifact download --step ruby-unit-tests coverage/coverage.json ." - - "buildkite-agent artifact download --step java-unit-tests **/jacocoTestReport.xml ." - - "buildkite-agent artifact download --step java-unit-tests **/build/classes/**/*.* ." - - "/scan-source-code.sh" - depends_on: - - "ruby-unit-tests" - - "java-unit-tests" - retry: - manual: - allowed: true -======= - label: ":java: Java unit tests - FIPS mode" key: "java-unit-tests-fips" agents: @@ -219,7 +197,6 @@ steps: docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 5 6 ->>>>>>> cbef0782 (ci: remove sonarqube (#18273)) - label: ":lab_coat: Integration Tests / part 1-of-6" key: "integration-tests-part-1-of-6" From e685512f62ee5403538590d05db495dffc63893a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 7 Oct 2025 09:04:31 +0200 Subject: [PATCH 3/3] fix --- .buildkite/pull_request_pipeline.yml | 140 --------------------------- 1 file changed, 140 deletions(-) diff --git a/.buildkite/pull_request_pipeline.yml b/.buildkite/pull_request_pipeline.yml index 05bda398c8b..a5522881546 100644 --- a/.buildkite/pull_request_pipeline.yml +++ b/.buildkite/pull_request_pipeline.yml @@ -58,146 +58,6 @@ steps: - "**/jacocoTestReport.xml" - "**/build/classes/**/*.*" - - label: ":java: Java unit tests - FIPS mode" - key: "java-unit-tests-fips" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - - docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . - docker run test-runner-image ./gradlew --info --stacktrace -PfedrampHighMode=true javaTests - artifact_paths: - - "**/build/test-results/javaTests/TEST-*.xml" - - "**/jacocoTestReport.xml" - - "**/build/classes/**/*.*" - - - label: "Observability SRE container smoke test" - key: "observability-sre-container-smoke-test" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - source .buildkite/scripts/common/vm-agent.sh - export ARCH="x86_64" - ./ci/observabilitySREsmoke_tests.sh - - - label: ":lab_coat: Integration Tests - FIPS mode / part 1-of-6" - key: "integration-tests-fips-part-1-of-6" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - - docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . - docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 0 6 - - - label: ":lab_coat: Integration Tests - FIPS mode / part 2-of-6" - key: "integration-tests-fips-part-2-of-6" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - - docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . - docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 1 6 - - - label: ":lab_coat: Integration Tests - FIPS mode / part 3-of-6" - key: "integration-tests-fips-part-3-of-6" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - - docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . - docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 2 6 - - - label: ":lab_coat: Integration Tests - FIPS mode / part 4-of-6" - key: "integration-tests-fips-part-4-of-6" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - - docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . - docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 3 6 - - - label: ":lab_coat: Integration Tests - FIPS mode / part 5-of-6" - key: "integration-tests-fips-part-5-of-6" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - - docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . - docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 4 6 - - - label: ":lab_coat: Integration Tests - FIPS mode / part 6-of-6" - key: "integration-tests-fips-part-6-of-6" - agents: - provider: gcp - imageProject: elastic-images-prod - image: family/platform-ingest-logstash-ubuntu-2204 - machineType: "n2-standard-4" - diskSizeGb: 64 - retry: - automatic: - - limit: 3 - command: | - set -euo pipefail - - docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile . - docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 5 6 - - label: ":lab_coat: Integration Tests / part 1-of-6" key: "integration-tests-part-1-of-6" agents: