Migrate build to Spring Develocity Conventions extension.
* Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #2333
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -10,4 +10,4 @@ target
|
|||||||
.classpath
|
.classpath
|
||||||
.idea
|
.idea
|
||||||
credentials.yml
|
credentials.yml
|
||||||
.mvn/.gradle-enterprise
|
.mvn/.develocity
|
||||||
|
|||||||
@@ -1,13 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<extensions>
|
<extensions>
|
||||||
<extension>
|
<extension>
|
||||||
<groupId>com.gradle</groupId>
|
<groupId>io.spring.develocity.conventions</groupId>
|
||||||
<artifactId>gradle-enterprise-maven-extension</artifactId>
|
<artifactId>develocity-conventions-maven-extension</artifactId>
|
||||||
<version>1.19.2</version>
|
<version>0.0.19</version>
|
||||||
</extension>
|
|
||||||
<extension>
|
|
||||||
<groupId>com.gradle</groupId>
|
|
||||||
<artifactId>common-custom-user-data-maven-extension</artifactId>
|
|
||||||
<version>1.12.4</version>
|
|
||||||
</extension>
|
</extension>
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
|
||||||
<gradleEnterprise
|
|
||||||
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
|
|
||||||
<server>
|
|
||||||
<url>https://ge.spring.io</url>
|
|
||||||
</server>
|
|
||||||
<buildScan>
|
|
||||||
<backgroundBuildScanUpload>false</backgroundBuildScanUpload>
|
|
||||||
<captureGoalInputFiles>true</captureGoalInputFiles>
|
|
||||||
<publishIfAuthenticated>true</publishIfAuthenticated>
|
|
||||||
<obfuscation>
|
|
||||||
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
|
|
||||||
</obfuscation>
|
|
||||||
</buildScan>
|
|
||||||
<buildCache>
|
|
||||||
<local>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</local>
|
|
||||||
<remote>
|
|
||||||
<server>
|
|
||||||
<credentials>
|
|
||||||
<username>${env.DEVELOCITY_CACHE_USERNAME}</username>
|
|
||||||
<password>${env.DEVELOCITY_CACHE_PASSWORD}</password>
|
|
||||||
</credentials>
|
|
||||||
</server>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
<storeEnabled>#{env['DEVELOCITY_CACHE_USERNAME'] != null and env['DEVELOCITY_CACHE_PASSWORD'] != null}</storeEnabled>
|
|
||||||
</remote>
|
|
||||||
</buildCache>
|
|
||||||
</gradleEnterprise>
|
|
||||||
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@@ -25,7 +25,6 @@ pipeline {
|
|||||||
options { timeout(time: 30, unit: 'MINUTES') }
|
options { timeout(time: 30, unit: 'MINUTES') }
|
||||||
environment {
|
environment {
|
||||||
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
|
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
|
||||||
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
|
|
||||||
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
|
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
@@ -33,9 +32,6 @@ pipeline {
|
|||||||
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
|
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
|
||||||
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
|
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
|
||||||
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
|
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
|
||||||
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
|
|
||||||
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
|
|
||||||
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
|
|
||||||
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
|
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -59,7 +55,6 @@ pipeline {
|
|||||||
options { timeout(time: 30, unit: 'MINUTES') }
|
options { timeout(time: 30, unit: 'MINUTES') }
|
||||||
environment {
|
environment {
|
||||||
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
|
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
|
||||||
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
|
|
||||||
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
|
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
@@ -67,9 +62,6 @@ pipeline {
|
|||||||
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
|
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
|
||||||
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
|
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
|
||||||
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
|
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
|
||||||
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
|
|
||||||
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
|
|
||||||
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
|
|
||||||
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
|
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,7 +79,6 @@ pipeline {
|
|||||||
|
|
||||||
environment {
|
environment {
|
||||||
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
|
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
|
||||||
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
|
|
||||||
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
|
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,9 +87,6 @@ pipeline {
|
|||||||
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
|
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
|
||||||
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
|
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
|
||||||
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
|
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
|
||||||
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
|
|
||||||
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
|
|
||||||
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
|
|
||||||
"./mvnw -s settings.xml -Pci,artifactory " +
|
"./mvnw -s settings.xml -Pci,artifactory " +
|
||||||
"-Dartifactory.server=${p['artifactory.url']} " +
|
"-Dartifactory.server=${p['artifactory.url']} " +
|
||||||
"-Dartifactory.username=${ARTIFACTORY_USR} " +
|
"-Dartifactory.username=${ARTIFACTORY_USR} " +
|
||||||
|
|||||||
@@ -31,6 +31,5 @@ docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
|
|||||||
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
|
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
|
||||||
artifactory.url=https://repo.spring.io
|
artifactory.url=https://repo.spring.io
|
||||||
artifactory.repository.snapshot=libs-snapshot-local
|
artifactory.repository.snapshot=libs-snapshot-local
|
||||||
develocity.cache.credentials=gradle_enterprise_cache_user
|
|
||||||
develocity.access-key=gradle_enterprise_secret_access_key
|
develocity.access-key=gradle_enterprise_secret_access_key
|
||||||
jenkins.user.name=spring-builds+jenkins
|
jenkins.user.name=spring-builds+jenkins
|
||||||
|
|||||||
Reference in New Issue
Block a user