You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/07/18 19:07:01 UTC

logging-log4net git commit: Jenkinsfile: wrap all in a dir()

Repository: logging-log4net
Updated Branches:
  refs/heads/feature/cd-pipeline 939deef8c -> 602052722


Jenkinsfile: wrap all in a dir()


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

Branch: refs/heads/feature/cd-pipeline
Commit: 602052722fa2786381d52a5395106122ceb990f2
Parents: 939deef
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Jul 18 21:06:49 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Jul 18 21:06:49 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/60205272/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index ad8029c..79783fe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,29 +42,31 @@ pipeline {
 				script {
 					checkout scm
 
-					// calculate args required to build the docker container
-					def JENKINS_UID = sh (
-						script: 'stat -c \"%u\" .',
-						returnStdout: true
-					).trim()
-					def JENKINS_GID = sh (
-						script: 'stat -c \"%g\" .',
-						returnStdout: true
-					).trim()
-					echo "$JENKINS_UID"
-					echo "$JENKINS_GID"
+					dir ('buildtools/docker/netstandard') {
+						// calculate args required to build the docker container
+						def JENKINS_UID = sh (
+							script: 'stat -c \"%u\" .',
+							returnStdout: true
+						).trim()
+						def JENKINS_GID = sh (
+							script: 'stat -c \"%g\" .',
+							returnStdout: true
+						).trim()
+						echo "$JENKINS_UID"
+						echo "$JENKINS_GID"
 
-					// build docker container
-					def docker_container = docker.build 'builder-netstandard:latest', "-f buildtools/docker/netstandard/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID buildtools/docker/netstandard"
+						// build docker container
+						def docker_container = docker.build 'builder-netstandard:latest', "--build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID buildtools/docker/netstandard"
 
-					// run docker container
-					docker_container.inside {
-						// compile
-						sh "nant compile-netstandard"
-						stash includes: 'bin/**/*.*', name: 'netstandard-assemblies'
+						// run docker container
+						docker_container.inside {
+							// compile
+							sh "nant compile-netstandard"
+							stash includes: 'bin/**/*.*', name: 'netstandard-assemblies'
 
-						// test
-						sh 'cd netstandard/log4net.tests && dotnet test'
+							// test
+							sh 'cd netstandard/log4net.tests && dotnet test'
+						}
 					}
 				}