Skip to content

Commit f2e1b7b

Browse files
v1vmergify[bot]
v1v
authored and
mergify[bot]
committed
ci: remove sonarqube (#18273)
this service will be decommissioned shortly (cherry picked from commit cbef078) # Conflicts: # .buildkite/pull_request_pipeline.yml
1 parent e31d9c9 commit f2e1b7b

File tree

6 files changed

+143
-35
lines changed

6 files changed

+143
-35
lines changed

‎.buildkite/aarch64_pipeline.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ steps:
2323

2424
- label: ":java: Java unit tests"
2525
key: "java-unit-tests"
26-
env:
27-
# https://github.com/elastic/logstash/pull/15486 for background
28-
ENABLE_SONARQUBE: "false"
2926
command: |
3027
set -euo pipefail
3128

‎.buildkite/pull_request_pipeline.yml‎

Lines changed: 142 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ steps:
4747
retry:
4848
automatic:
4949
- limit: 3
50-
env:
51-
ENABLE_SONARQUBE: true
5250
command: |
5351
set -euo pipefail
5452
source .buildkite/scripts/common/container-agent.sh
@@ -58,6 +56,7 @@ steps:
5856
- "**/jacocoTestReport.xml"
5957
- "**/build/classes/**/*.*"
6058

59+
<<<<<<< HEAD
6160
- label: ":sonarqube: Continuous Code Inspection"
6261
if: |
6362
build.pull_request.id != null ||
@@ -78,6 +77,147 @@ steps:
7877
retry:
7978
manual:
8079
allowed: true
80+
=======
81+
- label: ":java: Java unit tests - FIPS mode"
82+
key: "java-unit-tests-fips"
83+
agents:
84+
provider: gcp
85+
imageProject: elastic-images-prod
86+
image: family/platform-ingest-logstash-ubuntu-2204
87+
machineType: "n2-standard-4"
88+
diskSizeGb: 64
89+
retry:
90+
automatic:
91+
- limit: 3
92+
command: |
93+
set -euo pipefail
94+
95+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
96+
docker run test-runner-image ./gradlew --info --stacktrace -PfedrampHighMode=true javaTests
97+
artifact_paths:
98+
- "**/build/test-results/javaTests/TEST-*.xml"
99+
- "**/jacocoTestReport.xml"
100+
- "**/build/classes/**/*.*"
101+
102+
- label: "Observability SRE container smoke test"
103+
key: "observability-sre-container-smoke-test"
104+
agents:
105+
provider: gcp
106+
imageProject: elastic-images-prod
107+
image: family/platform-ingest-logstash-ubuntu-2204
108+
machineType: "n2-standard-4"
109+
diskSizeGb: 64
110+
retry:
111+
automatic:
112+
- limit: 3
113+
command: |
114+
set -euo pipefail
115+
source .buildkite/scripts/common/vm-agent.sh
116+
export ARCH="x86_64"
117+
./ci/observabilitySREsmoke_tests.sh
118+
119+
- label: ":lab_coat: Integration Tests - FIPS mode / part 1-of-6"
120+
key: "integration-tests-fips-part-1-of-6"
121+
agents:
122+
provider: gcp
123+
imageProject: elastic-images-prod
124+
image: family/platform-ingest-logstash-ubuntu-2204
125+
machineType: "n2-standard-4"
126+
diskSizeGb: 64
127+
retry:
128+
automatic:
129+
- limit: 3
130+
command: |
131+
set -euo pipefail
132+
133+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
134+
docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 0 6
135+
136+
- label: ":lab_coat: Integration Tests - FIPS mode / part 2-of-6"
137+
key: "integration-tests-fips-part-2-of-6"
138+
agents:
139+
provider: gcp
140+
imageProject: elastic-images-prod
141+
image: family/platform-ingest-logstash-ubuntu-2204
142+
machineType: "n2-standard-4"
143+
diskSizeGb: 64
144+
retry:
145+
automatic:
146+
- limit: 3
147+
command: |
148+
set -euo pipefail
149+
150+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
151+
docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 1 6
152+
153+
- label: ":lab_coat: Integration Tests - FIPS mode / part 3-of-6"
154+
key: "integration-tests-fips-part-3-of-6"
155+
agents:
156+
provider: gcp
157+
imageProject: elastic-images-prod
158+
image: family/platform-ingest-logstash-ubuntu-2204
159+
machineType: "n2-standard-4"
160+
diskSizeGb: 64
161+
retry:
162+
automatic:
163+
- limit: 3
164+
command: |
165+
set -euo pipefail
166+
167+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
168+
docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 2 6
169+
170+
- label: ":lab_coat: Integration Tests - FIPS mode / part 4-of-6"
171+
key: "integration-tests-fips-part-4-of-6"
172+
agents:
173+
provider: gcp
174+
imageProject: elastic-images-prod
175+
image: family/platform-ingest-logstash-ubuntu-2204
176+
machineType: "n2-standard-4"
177+
diskSizeGb: 64
178+
retry:
179+
automatic:
180+
- limit: 3
181+
command: |
182+
set -euo pipefail
183+
184+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
185+
docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 3 6
186+
187+
- label: ":lab_coat: Integration Tests - FIPS mode / part 5-of-6"
188+
key: "integration-tests-fips-part-5-of-6"
189+
agents:
190+
provider: gcp
191+
imageProject: elastic-images-prod
192+
image: family/platform-ingest-logstash-ubuntu-2204
193+
machineType: "n2-standard-4"
194+
diskSizeGb: 64
195+
retry:
196+
automatic:
197+
- limit: 3
198+
command: |
199+
set -euo pipefail
200+
201+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
202+
docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 4 6
203+
204+
- label: ":lab_coat: Integration Tests - FIPS mode / part 6-of-6"
205+
key: "integration-tests-fips-part-6-of-6"
206+
agents:
207+
provider: gcp
208+
imageProject: elastic-images-prod
209+
image: family/platform-ingest-logstash-ubuntu-2204
210+
machineType: "n2-standard-4"
211+
diskSizeGb: 64
212+
retry:
213+
automatic:
214+
- limit: 3
215+
command: |
216+
set -euo pipefail
217+
218+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
219+
docker run -e FEDRAMP_HIGH_MODE=true test-runner-image ci/integration_tests.sh split 5 6
220+
>>>>>>> cbef0782 (ci: remove sonarqube (#18273))
81221

82222
- label: ":lab_coat: Integration Tests / part 1-of-6"
83223
key: "integration-tests-part-1-of-6"

‎.buildkite/scripts/jdk-matrix-tests/generate-steps.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ def java_unit_test(self) -> JobRetValues:
229229
step_name_human = "Java Unit Test"
230230
step_key = f"{self.group_key}-java-unit-test"
231231
test_command = '''
232-
export ENABLE_SONARQUBE="false"
233232
ci/unit_tests.sh java
234233
'''
235234

‎ci/unit_tests.sh‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,16 @@ export GRADLE_OPTS="-Xmx4g -Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false
1010
export SPEC_OPTS="--order rand --format documentation"
1111
export CI=true
1212
export TEST_DEBUG=true
13-
# don't rely on bash booleans for truth checks, since some CI platforms don't have a way to specify env vars as boolean
14-
export ENABLE_SONARQUBE=${ENABLE_SONARQUBE:-"true"}
1513

1614
if [ -n "$BUILD_JAVA_HOME" ]; then
1715
GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
1816
fi
1917

2018
SELECTED_TEST_SUITE=$1
2119

22-
SONAR_ARGS=()
23-
if [[ $(echo $ENABLE_SONARQUBE | tr '[:lower:]' '[:upper:]') == "TRUE" ]]; then
24-
SONAR_ARGS=("jacocoTestReport")
25-
export COVERAGE=true
26-
fi
27-
2820
if [[ $SELECTED_TEST_SUITE == $"java" ]]; then
2921
echo "Running Java Tests"
30-
./gradlew javaTests "${SONAR_ARGS[@]}" --console=plain --warning-mode all
22+
./gradlew javaTests --console=plain --warning-mode all
3123
elif [[ $SELECTED_TEST_SUITE == $"ruby" ]]; then
3224
echo "Running Ruby unit tests"
3325
./gradlew rubyTests --console=plain --warning-mode all

‎logstash-core/build.gradle‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,14 @@ buildscript {
2929

3030
plugins {
3131
id "jacoco"
32-
id "org.sonarqube" version "4.3.0.3225"
3332
}
3433

3534
apply plugin: 'jacoco'
36-
apply plugin: "org.sonarqube"
3735

3836
repositories {
3937
mavenCentral()
4038
}
4139

42-
sonarqube {
43-
properties {
44-
property 'sonar.coverage.jacoco.xmlReportPaths', "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
45-
}
46-
}
47-
4840
jacoco {
4941
toolVersion = "0.8.9"
5042
}

‎sonar-project.properties‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)