Repository: brooklyn
Updated Branches:
  refs/heads/master 2610f6898 -> bd0f52c3b


jenkins: fix user.name in docker

User 910 is unknown in the docker container, so 
`${id -un 910}` does not return a name. We don’t 
care what user.name it has, as long as there is one.

Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/c2a3f375
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/c2a3f375
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/c2a3f375

Branch: refs/heads/master
Commit: c2a3f37518278c8a03c738f8ef1d4378fe628d3b
Parents: 2610f68
Author: Aled Sage <aled.s...@gmail.com>
Authored: Thu Sep 27 10:40:47 2018 +0100
Committer: Aled Sage <aled.s...@gmail.com>
Committed: Thu Sep 27 10:40:47 2018 +0100

----------------------------------------------------------------------
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/c2a3f375/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index e06ad4b..f37b75f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ node(label: 'ubuntu') {
 
             stage('Run tests') {
                 environmentDockerImage.inside('-i --rm --name 
brooklyn-${DOCKER_TAG} -u 910:910 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
-                    sh 'mvn clean install -Duser.home=/var/maven 
-Duser.name=$(id -un 910)'
+                    sh 'mvn clean install -Duser.home=/var/maven 
-Duser.name=jenkins'
                 }
             }
 
@@ -47,7 +47,7 @@ node(label: 'ubuntu') {
             if (env.CHANGE_ID == null) {
                 stage('Deploy artifacts') {
                     environmentDockerImage.inside('-i --rm --name 
brooklyn-${DOCKER_TAG} -u 910:910 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
-                        sh 'mvn deploy -DskipTests -Duser.home=/var/maven 
-Duser.name=$(id -un 910)'
+                        sh 'mvn deploy -DskipTests -Duser.home=/var/maven 
-Duser.name=jenkins'
                     }
                 }
             }

Reply via email to