Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develocity configuration #665

Merged
merged 5 commits into from
Jan 28, 2025
Merged

Develocity configuration #665

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0cc3fe
Adding basic develocity configuration #664
ribafish Jan 8, 2025
8f27268
Added the develocity api key to Jenkinsfile #664
ribafish Jan 13, 2025
58ed090
Jenkinsfile fixes: changed the develocity api key retieval and fixed …
ribafish Jan 13, 2025
cf26be5
Fixed the CI config for Develocity #664
ribafish Jan 13, 2025
13d4904
Added the copyright header to develocity.xml. #664
ribafish Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ target
*~
build.log
.local-repo
.flattened-pom.xml
.flattened-pom.xml
.mvn/.develocity/develocity-workspace-id
30 changes: 30 additions & 0 deletions .mvn/develocity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ribafish Please provide license header for this new file, you can use an existing .xml file as an example

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in 13d4904

<develocity
xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
<server>
<url>https://develocity-staging.eclipse.org</url>
</server>
<projectId>org.eclipse.mylyn</projectId>
<buildScan>
<obfuscation>
<username>#{'eclipse-' + env['EF_SHORT_NAME'] + '-bot'}</username>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace 'eclipse-' + env['EF_SHORT_NAME'] + '-bot' with eclipse-mylyn-bot, this configuration only apply to gitlab-CI. I will update documentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the line altogether as discussed on slack.

<ipAddresses>0.0.0.0</ipAddresses>
</obfuscation>
<publishing>
<onlyIf>
<![CDATA[authenticated]]>
</onlyIf>
</publishing>
<backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
</buildScan>
<buildCache>
<local>
<enabled>false</enabled>
</local>
<remote>
<enabled>false</enabled>
<storeEnabled>#{isTrue(env['CI'])}</storeEnabled>
</remote>
</buildCache>
</develocity>
10 changes: 10 additions & 0 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,14 @@
<artifactId>tycho-build</artifactId>
<version>4.0.8</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
<version>1.23</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>2.0.1</version>
</extension>
</extensions>
39 changes: 25 additions & 14 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
* Contributors:
* See git history
*******************************************************************************/
def secrets = [
[path: 'cbi/org.eclipse.mylyn/develocity.eclipse.org', secretValues: [
[envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token']
]
]
]


pipeline {
options {
timeout(time: 80, unit: 'MINUTES')
Expand Down Expand Up @@ -73,20 +81,23 @@ MAVEN_PROFILES=${env.MAVEN_PROFILES}
steps {
sshagent (['projects-storage.eclipse.org-bot-ssh']) {
wrap([$class: 'Xvnc', useXauthority: true]) {
sh '''
mvn \
clean \
verify \
-B \
$MAVEN_PROFILES \
-Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Dmaven.test.failure.ignore=true \
-Dmaven.test.error.ignore=true \
-Ddash.fail=false \
-Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL \
-Dbuild.type=$BUILD_TYPE \
-Dgit.commit=$GIT_COMMIT
'''
withVault([vaultSecrets: secrets]) {
sh '''
mvn \
clean \
verify \
-B \
$MAVEN_PROFILES \
-Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Ddevelocity.storage.directory=$WORKSPACE/.m2/.develocity \
-Dmaven.test.failure.ignore=true \
-Dmaven.test.error.ignore=true \
-Ddash.fail=false \
-Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL \
-Dbuild.type=$BUILD_TYPE \
-Dgit.commit=$GIT_COMMIT
'''
}
}
}
}
Expand Down