From 6275b358b1c93c6e44605e7067ed45f070764baf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 26 Feb 2019 17:05:02 -0500
Subject: [PATCH] Update Jenkinsfile
---
Jenkinsfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d7b0dc62..f07c3f43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,12 @@ pipeline {
echo "You must define an imagename in common.bash"
currentBuild.result = 'FAILURE'
}
- sh 'mkdir -p bin'
- sh 'mkdir -p tmp'
+
+ sh 'mkdir -p tmp && mkdir -p bin'
dir('tmp'){
git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
- sh 'ls'
- sh 'mv bin/* ../bin'
+ sh 'rm -rf ../bin/*'
+ sh 'mv ./bin/* ../bin/.'
}
// Build and test scripts expect that 'tag' is present in common.bash. This is necessary for both Jenkins and standalone testing.
// We don't care if there are more 'tag' assignments there. The latest one wins.