Skip to content

Commit 69b0525

Browse files
committed
DATAKV-264 - Set user.name and user.home for CI jobs.
1 parent a73dda0 commit 69b0525

File tree

3 files changed

+14
-118
lines changed

3 files changed

+14
-118
lines changed

.mvn/wrapper/MavenWrapperDownloader.java

-110
This file was deleted.

Jenkinsfile

+12-6
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ pipeline {
1717
agent {
1818
docker {
1919
image 'adoptopenjdk/openjdk8:latest'
20-
args '-v $HOME/.m2:/root/.m2'
20+
args '-v $HOME/.m2:/tmp/spring-data-maven-repository'
2121
}
2222
}
23+
options { timeout(time: 30, unit: 'MINUTES') }
2324
steps {
24-
sh "./mvnw clean dependency:list test -Dsort -B"
25+
sh 'rm -rf ?'
26+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw clean dependency:list test -Dsort -B'
2527
}
2628
}
2729
}
@@ -33,16 +35,18 @@ pipeline {
3335
agent {
3436
docker {
3537
image 'adoptopenjdk/openjdk8:latest'
36-
args '-v $HOME/.m2:/root/.m2'
38+
args '-v $HOME/.m2:/tmp/spring-data-maven-repository'
3739
}
3840
}
41+
options { timeout(time: 20, unit: 'MINUTES') }
3942

4043
environment {
4144
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
4245
}
4346

4447
steps {
45-
sh "USERNAME=${ARTIFACTORY_USR} PASSWORD=${ARTIFACTORY_PSW} ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B"
48+
sh 'rm -rf ?'
49+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B'
4650
}
4751
}
4852
stage('Release to artifactory with docs') {
@@ -52,16 +56,18 @@ pipeline {
5256
agent {
5357
docker {
5458
image 'adoptopenjdk/openjdk8:latest'
55-
args '-v $HOME/.m2:/root/.m2'
59+
args '-v $HOME/.m2:/tmp/spring-data-maven-repository'
5660
}
5761
}
62+
options { timeout(time: 20, unit: 'MINUTES') }
5863

5964
environment {
6065
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
6166
}
6267

6368
steps {
64-
sh "USERNAME=${ARTIFACTORY_USR} PASSWORD=${ARTIFACTORY_PSW} ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B"
69+
sh 'rm -rf ?'
70+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B'
6571
}
6672
}
6773
}

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
</deployProperties>
143143
<publisher>
144144
<contextUrl>https://repo.spring.io</contextUrl>
145-
<username>{{USERNAME}}</username>
146-
<password>{{PASSWORD}}</password>
145+
<username>{{ARTIFACTORY_USR}}</username>
146+
<password>{{ARTIFACTORY_PSW}}</password>
147147
<repoKey>libs-snapshot-local</repoKey>
148148
<snapshotRepoKey>libs-snapshot-local</snapshotRepoKey>
149149
</publisher>

0 commit comments

Comments
 (0)