Skip to content

Commit ded14e9

Browse files
SONARJAVA-5244 Onboard sonar-java on Develocity (#4963)
1 parent 8a69039 commit ded14e9

File tree

5 files changed

+30
-20
lines changed

5 files changed

+30
-20
lines changed

.cirrus.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ env:
1111
ARTIFACTORY_DEPLOY_REPO: sonarsource-public-qa
1212
ARTIFACTORY_ACCESS_TOKEN: VAULT[development/artifactory/token/${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}-private-reader access_token]
1313
GITHUB_TOKEN: VAULT[development/github/token/licenses-ro token]
14-
GRADLE_ENTERPRISE_USERNAME: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.username]
15-
GRADLE_ENTERPRISE_PASSWORD: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.password]
16-
GRADLE_ENTERPRISE_URL: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.url]
17-
GRADLE_ENTERPRISE_KEY: VAULT[development/team/sonarqube/kv/data/gradle-enterprise data.access-key]
14+
DEVELOCITY_TOKEN: VAULT[development/kv/data/develocity data.token]
15+
DEVELOCITY_ACCESS_KEY: develocity.sonar.build=${DEVELOCITY_TOKEN}
1816
# Use bash (instead of sh on linux or cmd.exe on windows)
1917
CIRRUS_SHELL: bash
2018
# Allows to run builds for the 50 last commits in a branch:
@@ -47,6 +45,10 @@ win_vm_definition: &WINDOWS_VM_DEFINITION
4745
only_sonarsource_qa: &ONLY_SONARSOURCE_QA
4846
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BRANCH =~ "dogfood-on-.*")
4947

48+
log_develocity_url_script: &log_develocity_url_script |
49+
echo "Develocity URL: https://develocity.sonar.build/scans?search.publicHostnames=cirrus-ci-task-${CIRRUS_TASK_ID}"
50+
51+
5052
common_build_definition: &COMMON_BUILD_DEFINITION
5153
eks_container:
5254
<<: *CONTAINER_DEFINITION
@@ -82,13 +84,15 @@ orchestrator_cache_elements_definition: &ORCHESTRATOR_CACHE_ELEMENTS_DEFINITION
8284
build_task:
8385
<<: *COMMON_BUILD_DEFINITION
8486
build_script:
87+
- *log_develocity_url_script
8588
- source cirrus-env BUILD
8689
- regular_mvn_build_deploy_analyze -Dmaven.test.skip=true -Dsonar.skip=true -pl '!java-checks-test-sources/default,!java-checks-test-sources/aws'
8790
cleanup_before_cache_script: cleanup_maven_repository
8891

8992
test_analyze_task:
9093
<<: *COMMON_BUILD_DEFINITION
9194
build_script:
95+
- *log_develocity_url_script
9296
- source cirrus-env BUILD
9397
# ignore duplications in the SE engine plugin, as it will be moved away from sonar-java at some point
9498
- PULL_REQUEST_SHA=$GIT_SHA1 regular_mvn_build_deploy_analyze -P-deploy-sonarsource,-release,-sign -Dmaven.deploy.skip=true -Dsonar.analysisCache.enabled=true -Dsonar.cpd.exclusions=java-symbolic-execution/**
@@ -128,6 +132,7 @@ qa_os_win_task:
128132
maven_cache:
129133
folder: ${CIRRUS_WORKING_DIR}/.m2/repository
130134
build_script:
135+
- *log_develocity_url_script
131136
- source cirrus-env CI
132137
- mvn.cmd clean verify
133138
cleanup_before_cache_script: cleanup_maven_repository
@@ -157,6 +162,7 @@ plugin_qa_task:
157162
submodules_script:
158163
- git submodule update --init --recursive
159164
qa_script:
165+
- *log_develocity_url_script
160166
- source cirrus-env QA
161167
- source set_maven_build_version $BUILD_NUMBER
162168
- cd its/plugin
@@ -175,6 +181,7 @@ sanity_task:
175181
maven_cache:
176182
folder: ${CIRRUS_WORKING_DIR}/.m2/repository
177183
sanity_script:
184+
- *log_develocity_url_script
178185
- source cirrus-env QA
179186
- source set_maven_build_version $BUILD_NUMBER
180187
- cd java-checks-test-sources
@@ -205,6 +212,7 @@ ruling_task:
205212
- PROFILE: without-sonarqube-project
206213
- PROFILE: only-sonarqube-project
207214
ruling_script:
215+
- *log_develocity_url_script
208216
- source cirrus-env QA
209217
- source set_maven_build_version $BUILD_NUMBER
210218
- cd its/ruling
@@ -232,6 +240,7 @@ ruling_win_task:
232240
- PROFILE: without-sonarqube-project
233241
- PROFILE: only-sonarqube-project
234242
ruling_script:
243+
- *log_develocity_url_script
235244
- source cirrus-env QA
236245
- source set_maven_build_version $BUILD_NUMBER
237246
- init_git_submodules its/sources
@@ -258,6 +267,7 @@ autoscan_task:
258267
orchestrator_LATEST_RELEASE_cache:
259268
<<: *ORCHESTRATOR_CACHE_ELEMENTS_DEFINITION
260269
autoscan_script:
270+
- *log_develocity_url_script
261271
- source cirrus-env QA
262272
- source set_maven_build_version $BUILD_NUMBER
263273
- cd java-checks-test-sources

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ Desktop.ini
3939

4040
.java-version
4141
.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
42+
.mvn/.develocity/

.mvn/develocity.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<develocity>
2+
<server>
3+
<url>https://develocity.sonar.build</url>
4+
</server>
5+
<buildCache>
6+
<local>
7+
<storeEnabled>#{env['CI'] == null}</storeEnabled>
8+
</local>
9+
<remote>
10+
<storeEnabled>#{env['CI'] != null}</storeEnabled>
11+
</remote>
12+
</buildCache>
13+
</develocity>

.mvn/extensions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<extensions>
22
<extension>
33
<groupId>com.gradle</groupId>
4-
<artifactId>gradle-enterprise-maven-extension</artifactId>
5-
<version>1.19.3</version>
4+
<artifactId>develocity-maven-extension</artifactId>
5+
<version>1.22.2</version>
66
</extension>
77
<extension>
88
<groupId>com.gradle</groupId>

.mvn/gradle-enterprise.xml

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

0 commit comments

Comments
 (0)