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 Psenner <dpsen...@apache.org>
Authored: Thu May 10 22:32:13 2018 +0200
Committer: Dominik Psenner <dpsen...@apache.org>
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 {

Reply via email to