Skip to content

Commit 15c883e

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 6fc579a commit 15c883e

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
@@ -49,8 +49,6 @@ steps:
4949
retry:
5050
automatic:
5151
- limit: 3
52-
env:
53-
ENABLE_SONARQUBE: true
5452
command: |
5553
set -euo pipefail
5654
source .buildkite/scripts/common/container-agent.sh
@@ -60,6 +58,7 @@ steps:
6058
- "**/jacocoTestReport.xml"
6159
- "**/build/classes/**/*.*"
6260

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

84224
- label: ":lab_coat: Integration Tests / part 1-of-6"
85225
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
@@ -23,22 +23,14 @@ buildscript {
2323

2424
plugins {
2525
id "jacoco"
26-
id "org.sonarqube" version "4.3.0.3225"
2726
}
2827

2928
apply plugin: 'jacoco'
30-
apply plugin: "org.sonarqube"
3129

3230
repositories {
3331
mavenCentral()
3432
}
3533

36-
sonarqube {
37-
properties {
38-
property 'sonar.coverage.jacoco.xmlReportPaths', "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
39-
}
40-
}
41-
4234
jacoco {
4335
toolVersion = "0.8.9"
4436
}

‎sonar-project.properties‎

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

0 commit comments

Comments
 (0)