Skip to content

Commit 6eccb39

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

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Jenkinsfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,17 @@ 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 " +
103+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
103104
"-Dartifactory.server=${p['artifactory.url']} " +
104105
"-Dartifactory.username=${ARTIFACTORY_USR} " +
105106
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
106107
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
107108
"-Dartifactory.build-name=spring-data-couchbase " +
108109
"-Dartifactory.build-number=spring-data-couchbase-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
110+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase " +
109111
"-Dmaven.test.skip=true clean deploy -U -B"
110112
}
111113
}

ci/clean.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
export JENKINS_USER=${JENKINS_USER_NAME}
66

77
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
8-
./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase
8+
./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root

ci/test.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
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

109
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
1110
./mvnw -s settings.xml \
12-
-P${PROFILE} clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase
11+
-P${PROFILE} clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root

0 commit comments

Comments
 (0)