Use a develocity url from the env variable

Author: marko-bekhta

.github/workflows/ci.yml

@@ -109,6 +109,7 @@ jobs:
           -Pjqassistant -Pdist
         env:
           DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"
+          DEVELOCITY_BASE_URL: "${{ env.DEVELOCITY_BASE_URL || 'https://develocity.commonhaus.dev' }}"
       # For jobs running on 'pull_request', upload build scan data.
       # The actual publishing must be done in a separate job (see ci-report.yml).
       # We don't write to the remote cache as that would be unsafe.
@@ -127,6 +128,7 @@ jobs:
           -Dincontainer -Dincontainer-prepared
         env:
           DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"
+          DEVELOCITY_BASE_URL: "${{ env.DEVELOCITY_BASE_URL || 'https://develocity.commonhaus.dev' }}"
 
       - name: Upload GitHub Actions artifact for the Develocity build scan
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1

Jenkinsfile

@@ -581,13 +581,16 @@ void withMavenWorkspace(Map args, Closure body) {
 void mvn(String args) {
 	def develocityMainCredentialsId = helper.configuration.file?.develocity?.credentials?.main
 	def develocityPrCredentialsId = helper.configuration.file?.develocity?.credentials?.pr
+	def develocityBaseUrl = helper.configuration.file?.develocity?.url
 	if ( !helper.scmSource.pullRequest && develocityMainCredentialsId ) {
 		// Not a PR: we can pass credentials to the build, allowing it to populate the build cache
 		// and to publish build scans directly.
-		withCredentials([string(credentialsId: develocityMainCredentialsId,
-				variable: 'DEVELOCITY_ACCESS_KEY')]) {
-			withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
-				sh "mvn $args"
+		withEnv(["DEVELOCITY_BASE_URL=${develocityBaseUrl}"]) {
+			withCredentials([string(credentialsId: develocityMainCredentialsId,
+					variable: 'DEVELOCITY_ACCESS_KEY')]) {
+				withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
+					sh "mvn $args"
+				}
 			}
 		}
 	}
@@ -597,10 +600,12 @@ void mvn(String args) {
 		tryFinally({
 			sh "mvn $args"
 		}, { // Finally
-			withCredentials([string(credentialsId: develocityPrCredentialsId,
-					variable: 'DEVELOCITY_ACCESS_KEY')]) {
-				withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
-					sh 'mvn develocity:build-scan-publish-previous || true'
+			withEnv(["DEVELOCITY_BASE_URL=${develocityBaseUrl}"]) {
+				withCredentials([string(credentialsId: develocityPrCredentialsId,
+						variable: 'DEVELOCITY_ACCESS_KEY')]) {
+					withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
+						sh 'mvn develocity:build-scan-publish-previous || true'
+					}
 				}
 			}
 		})