From e833c93080770946cd7a8e2c0070025436a5a0a1 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Fri, 8 Sep 2017 08:38:04 +0200
Subject: [PATCH] Update Jenkinsfile
- change label (jenkins-slave should have docker-compose installed)
- only push when the current commit is a tag
---
Jenkinsfile | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c548e32..4fdb8bd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,11 +1,14 @@
pipeline {
- agent { label 'docker' }
+ agent { label 'docker-compose' }
+
+ environment {
+ GIT_TAG = sh(returnStdout: true, script: 'git describe --exact-match || true').trim()
+ }
stages {
stage('Refresh') {
steps {
slackSend (color: 'good', message: "STARTED: <${env.BUILD_URL}|${env.JOB_NAME} [${env.BUILD_NUMBER}]>")
- sh 'git fetch --tags'
sh 'make clean'
sh 'make refresh'
}
@@ -26,20 +29,19 @@ pipeline {
}
}
stage('Push') {
+ when {
+ expression { "$GIT_TAG" != "" }
+ }
steps {
sh 'make tag'
sh 'make push'
}
}
- stage('Clean') {
- steps {
- sh 'make clean'
- }
- }
}
post {
always {
+ sh 'make clean'
/* clean up the workspace */
deleteDir()
}
--
GitLab