Skip to content

Commit 25b06f6

Browse files
committed
BUILD-7003 Set up Develocity
1 parent 28718ef commit 25b06f6

File tree

4 files changed

+199
-7
lines changed

4 files changed

+199
-7
lines changed

.cirrus.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
env:
2-
CIRRUS_VAULT_URL: https://vault.sonar.build:8200
3-
CIRRUS_VAULT_AUTH_PATH: jwt-cirrusci
4-
CIRRUS_VAULT_ROLE: cirrusci-${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}
5-
62
ARTIFACTORY_URL: VAULT[development/kv/data/repox data.url]
73

84
ARTIFACTORY_PRIVATE_USERNAME: vault-${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}-private-reader
@@ -18,6 +14,9 @@ env:
1814
ORG_GRADLE_PROJECT_signingPassword: VAULT[development/kv/data/sign data.passphrase]
1915
ORG_GRADLE_PROJECT_signingKeyId: 0x7DCD4258
2016

17+
DEVELOCITY_TOKEN: VAULT[development/kv/data/develocity data.token]
18+
DEVELOCITY_ACCESS_KEY: develocity.sonar.build=${DEVELOCITY_TOKEN}
19+
2120
# Use bash (instead of sh on linux or cmd.exe on windows)
2221
CIRRUS_SHELL: bash
2322

@@ -81,7 +80,7 @@ gradle_its_template: &GRADLE_ITS_TEMPLATE
8180
git submodule update --init --depth 1 "${GIT_SUB_MODULE}"
8281
fi
8382
- source cirrus-env QA
84-
- ./gradlew "${GRADLE_TASK}" "-P${ITS_PROJECT}"
83+
- ./gradlew "${GRADLE_TASK}" "-P${ITS_PROJECT}" -Dscan.tag.CI -Dscan.tag.${ITS_PROJECT} -Dscan.tag.SQ_${SQ_VERSION}
8584
"-Dsonar.runtimeVersion=${SQ_VERSION}"
8685
"-DbuildNumber=$BUILD_NUMBER"
8786
--info --console plain --no-daemon --build-cache
@@ -146,7 +145,7 @@ ws_scan_task:
146145
folder: ${CIRRUS_WORKING_DIR}/.m2/repository
147146
whitesource_script:
148147
- source cirrus-env QA
149-
- ./gradlew clean assemble
148+
- ./gradlew clean assemble -Dscan.tag.WS_BUILD
150149
- source ./export_ws_variables.sh
151150
- source ws_scan.sh
152151
allow_failures: "true"
@@ -202,7 +201,7 @@ qa_ruling_kotlin_compiler_task:
202201
git submodule update --init --depth 1 "${GIT_SUB_MODULE}"
203202
fi
204203
- source cirrus-env QA
205-
- ./gradlew :its:ruling:test --tests "org.sonarsource.slang.SlangRulingTest.test_kotlin_compiler" -Pruling
204+
- ./gradlew :its:ruling:test --tests "org.sonarsource.slang.SlangRulingTest.test_kotlin_compiler" -Pruling -Dscan.tag.CI -Dscan.tag.ruling -Dscan.tag.kotlin-compiler
206205
"-Dsonar.runtimeVersion=${SQ_VERSION}"
207206
"-DbuildNumber=$BUILD_NUMBER"
208207
--info --console plain --no-daemon --build-cache

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ description=Code Analyzer for Kotlin
44
projectTitle=Kotlin
55
kotlinVersion=2.0.21
66
org.gradle.jvmargs=-Xmx4096M
7+
org.gradle.caching=true

0 commit comments

Comments
 (0)