File tree Expand file tree Collapse file tree 6 files changed +1
-58
lines changed Expand file tree Collapse file tree 6 files changed +1
-58
lines changed Original file line number Diff line number Diff line change 23
23
24
24
- label : " :java: Java unit tests"
25
25
key : " java-unit-tests"
26
- env :
27
- # https://github.com/elastic/logstash/pull/15486 for background
28
- ENABLE_SONARQUBE : " false"
29
26
command : |
30
27
set -euo pipefail
31
28
Original file line number Diff line number Diff line change 86
86
retry :
87
87
automatic :
88
88
- limit : 3
89
- env :
90
- ENABLE_SONARQUBE : true
91
89
command : |
92
90
set -euo pipefail
93
91
source .buildkite/scripts/common/container-agent.sh
@@ -108,8 +106,6 @@ steps:
108
106
retry :
109
107
automatic :
110
108
- limit : 3
111
- env :
112
- ENABLE_SONARQUBE : true
113
109
command : |
114
110
set -euo pipefail
115
111
@@ -120,27 +116,6 @@ steps:
120
116
- " **/jacocoTestReport.xml"
121
117
- " **/build/classes/**/*.*"
122
118
123
- - label : " :sonarqube: Continuous Code Inspection"
124
- if : |
125
- build.pull_request.id != null ||
126
- build.branch == "main" ||
127
- build.branch =~ /^[0-9]+\.[0-9]+\$/
128
- env :
129
- VAULT_SONAR_TOKEN_PATH : " kv/ci-shared/platform-ingest/elastic/logstash/sonar-analyze-token"
130
- agents :
131
- image : " docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest"
132
- command :
133
- - " buildkite-agent artifact download --step ruby-unit-tests coverage/coverage.json ."
134
- - " buildkite-agent artifact download --step java-unit-tests **/jacocoTestReport.xml ."
135
- - " buildkite-agent artifact download --step java-unit-tests **/build/classes/**/*.* ."
136
- - " /scan-source-code.sh"
137
- depends_on :
138
- - " ruby-unit-tests"
139
- - " java-unit-tests"
140
- retry :
141
- manual :
142
- allowed : true
143
-
144
119
- label : " Observability SRE container smoke test"
145
120
key : " observability-sre-container-smoke-test"
146
121
agents :
Original file line number Diff line number Diff line change @@ -229,7 +229,6 @@ def java_unit_test(self) -> JobRetValues:
229
229
step_name_human = "Java Unit Test"
230
230
step_key = f"{ self .group_key } -java-unit-test"
231
231
test_command = '''
232
- export ENABLE_SONARQUBE="false"
233
232
ci/unit_tests.sh java
234
233
'''
235
234
Original file line number Diff line number Diff line change @@ -10,24 +10,16 @@ export GRADLE_OPTS="-Xmx4g -Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false
10
10
export SPEC_OPTS=" --order rand --format documentation"
11
11
export CI=true
12
12
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" }
15
13
16
14
if [ -n " $BUILD_JAVA_HOME " ]; then
17
15
GRADLE_OPTS=" $GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME "
18
16
fi
19
17
20
18
SELECTED_TEST_SUITE=$1
21
19
22
- SONAR_ARGS=()
23
- if [[ $( echo $ENABLE_SONARQUBE | tr ' [:lower:]' ' [:upper:]' ) == " TRUE" ]]; then
24
- SONAR_ARGS=(" jacocoTestReport" )
25
- export COVERAGE=true
26
- fi
27
-
28
20
if [[ $SELECTED_TEST_SUITE == $" java" ]]; then
29
21
echo " Running Java Tests"
30
- ./gradlew javaTests " ${SONAR_ARGS[@]} " --console=plain --warning-mode all
22
+ ./gradlew javaTests --console=plain --warning-mode all
31
23
elif [[ $SELECTED_TEST_SUITE == $" ruby" ]]; then
32
24
echo " Running Ruby unit tests"
33
25
./gradlew rubyTests --console=plain --warning-mode all
Original file line number Diff line number Diff line change @@ -23,22 +23,14 @@ buildscript {
23
23
24
24
plugins {
25
25
id " jacoco"
26
- id " org.sonarqube" version " 4.3.0.3225"
27
26
}
28
27
29
28
apply plugin : ' jacoco'
30
- apply plugin : " org.sonarqube"
31
29
32
30
repositories {
33
31
mavenCentral()
34
32
}
35
33
36
- sonarqube {
37
- properties {
38
- property ' sonar.coverage.jacoco.xmlReportPaths' , " ${ buildDir} /reports/jacoco/test/jacocoTestReport.xml"
39
- }
40
- }
41
-
42
34
jacoco {
43
35
toolVersion = " 0.8.9"
44
36
}
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments