logging-log4net git commit: Restore previous jenkinsfile now that we use ubuntu:16.04
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 9839767e0 -> 8f28eb213 Restore previous jenkinsfile now that we use ubuntu:16.04 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/8f28eb21 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/8f28eb21 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/8f28eb21 Branch: refs/heads/feature/cd-pipeline Commit: 8f28eb2136d3caf1de715a60fbe6af643219b997 Parents: 9839767 Author: Dominik PsennerAuthored: Thu May 10 22:32:13 2018 +0200 Committer: Dominik Psenner Committed: Thu May 10 22:32:13 2018 +0200 -- Jenkinsfile | 31 +-- 1 file changed, 13 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8f28eb21/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 55318ac..d4bf538 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -155,26 +155,21 @@ pipeline { } } stage('build mono-2.0') { - steps { - script { - checkout scm - def builder_target = "mono-2.0" - def builder_dir = "buildtools/docker/builder-$builder_target" - - // build docker container - def builder = docker.build "builder-$builder_target:latest", "--file $builder_dir/Dockerfile $builder_dir" - - // run docker container - builder.inside { - sh "rm -rf bin/ tests/" - checkout scm - sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0" - stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies' - sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0" - stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults' - } + agent { + dockerfile { + dir 'buildtools/docker/builder-mono-2.0' + args '-v /etc/localtime:/etc/localtime:ro' + reuseNode true } } + steps { + sh "rm -rf bin/ tests/" + checkout scm + sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0" + stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies' + sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0" + stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults' + } } stage('build mono-3.5') { agent {
logging-log4net git commit: mono-2.0: attempt to build with ubuntu:16.04
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline dac034262 -> 9839767e0 mono-2.0: attempt to build with ubuntu:16.04 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9839767e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9839767e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9839767e Branch: refs/heads/feature/cd-pipeline Commit: 9839767e0acd1e67eb459e048868712e1aa2a958 Parents: dac0342 Author: Dominik PsennerAuthored: Thu May 10 20:33:51 2018 +0200 Committer: Dominik Psenner Committed: Thu May 10 20:33:51 2018 +0200 -- buildtools/docker/builder-mono-2.0/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9839767e/buildtools/docker/builder-mono-2.0/Dockerfile -- diff --git a/buildtools/docker/builder-mono-2.0/Dockerfile b/buildtools/docker/builder-mono-2.0/Dockerfile index 180990b..2afed9f 100644 --- a/buildtools/docker/builder-mono-2.0/Dockerfile +++ b/buildtools/docker/builder-mono-2.0/Dockerfile @@ -1,5 +1,5 @@ -# Name of container: docker-ubuntu-latest-nant -FROM ubuntu:latest +# Name of container +FROM ubuntu:16.04 # set the maintainer of this docker image MAINTAINER "d...@logging.apache.org"
logging-log4net git commit: Replace single quote with double quot to make variables work
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline dcaca5ad2 -> dac034262 Replace single quote with double quot to make variables work Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dac03426 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dac03426 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dac03426 Branch: refs/heads/feature/cd-pipeline Commit: dac034262b79122475fa52b48cf76ad6c9e8bfc2 Parents: dcaca5a Author: Dominik PsennerAuthored: Thu May 10 11:45:55 2018 +0200 Committer: Dominik Psenner Committed: Thu May 10 11:45:55 2018 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dac03426/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 29f4a51..55318ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -162,7 +162,7 @@ pipeline { def builder_dir = "buildtools/docker/builder-$builder_target" // build docker container - def builder = docker.build 'builder-$builder_target:latest', "--file $builder_dir/Dockerfile $builder_dir" + def builder = docker.build "builder-$builder_target:latest", "--file $builder_dir/Dockerfile $builder_dir" // run docker container builder.inside {
logging-log4net git commit: mono-2.0: remove the outer agent dockerfile
Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 2d1c4d78a -> dcaca5ad2 mono-2.0: remove the outer agent dockerfile Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dcaca5ad Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dcaca5ad Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dcaca5ad Branch: refs/heads/feature/cd-pipeline Commit: dcaca5ad2c7d87b59a8bf8795b06f2a83ae2b352 Parents: 2d1c4d7 Author: Dominik PsennerAuthored: Thu May 10 09:48:17 2018 +0200 Committer: Dominik Psenner Committed: Thu May 10 09:48:17 2018 +0200 -- Jenkinsfile | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dcaca5ad/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 4df17e0..29f4a51 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -155,13 +155,6 @@ pipeline { } } stage('build mono-2.0') { - agent { - dockerfile { - dir 'buildtools/docker/builder-mono-2.0' - args '-v /etc/localtime:/etc/localtime:ro' - reuseNode true - } - } steps { script { checkout scm