You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2018/10/01 08:19:57 UTC
[1/2] brooklyn git commit: jenkins: fix npm build, removing docker -u
Repository: brooklyn
Updated Branches:
refs/heads/master a915db731 -> 7f421bb10
jenkins: fix npm build, removing docker -u
npm writes to ~/.npm, and reads ~/.npmrc. But user 910 does
not exist in container, so has no home directory. Therefore
npm fails. Reverting `-u` for now.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/18d07ee8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/18d07ee8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/18d07ee8
Branch: refs/heads/master
Commit: 18d07ee82b10c5fc9415accd200701e1e4ca8642
Parents: bd0f52c
Author: Aled Sage <al...@gmail.com>
Authored: Mon Oct 1 09:14:58 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Oct 1 09:15:05 2018 +0100
----------------------------------------------------------------------
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn/blob/18d07ee8/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index f37b75f..c41da46 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,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') {
+ environmentDockerImage.inside('-i --rm --name brooklyn-${DOCKER_TAG} --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=jenkins'
}
}
@@ -46,7 +46,7 @@ node(label: 'ubuntu') {
// Conditional stage to deploy artifacts, when not building a PR
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') {
+ environmentDockerImage.inside('-i --rm --name brooklyn-${DOCKER_TAG} --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=jenkins'
}
}
[2/2] brooklyn git commit: This closes #23
Posted by al...@apache.org.
This closes #23
Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/7f421bb1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/7f421bb1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/7f421bb1
Branch: refs/heads/master
Commit: 7f421bb10bffe1ba966d3a16bf1f172f85d84022
Parents: a915db7 18d07ee
Author: Aled Sage <al...@gmail.com>
Authored: Mon Oct 1 09:19:35 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Oct 1 09:19:35 2018 +0100
----------------------------------------------------------------------
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------