Skip to content

Commit 8b3bab6

Browse files
committed
Fix CI permission issues.
Consistently build all steps with the same docker user. Closes #1973
1 parent 07f738f commit 8b3bab6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Jenkinsfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,16 @@ pipeline {
9797
steps {
9898
script {
9999
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
100-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
100+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
101101
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
102-
"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase-non-root " +
102+
"./mvnw -s settings.xml -Pci,artifactory " +
103103
"-Dartifactory.server=${p['artifactory.url']} " +
104104
"-Dartifactory.username=${ARTIFACTORY_USR} " +
105105
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
106106
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
107107
"-Dartifactory.build-name=spring-data-couchbase " +
108108
"-Dartifactory.build-number=spring-data-couchbase-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
109+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase " +
109110
"-Dmaven.test.skip=true clean deploy -U -B"
110111
}
111112
}

ci/test.sh

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
set -euo pipefail
44

55
mkdir -p /tmp/jenkins-home/.m2/spring-data-couchbase
6-
chown -R 1001:1001 .
76

87
export JENKINS_USER=${JENKINS_USER_NAME}
98

0 commit comments

Comments
 (0)