Merge pull request #5 from pndaproject/RELEASE-0.1.1

Refine master branch build to use release tags

Author: trsmith2

CHANGELOG renamed to CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.1.1] 2016-09-13
+### Changes
+- Improvements to documentation
+- Enhanced CI support
+
 ## [0.1.0] 2016-07-01
 ### First version
 

Jenkinsfile

@@ -1,24 +1,34 @@
 node {
     try {
         stage 'Build'
+
+        deleteDir()
+        
+        checkout scm
+
         def workspace = pwd() 
+        def version = env.BRANCH_NAME
 
-        sh '''
-            echo $PWD
-            echo $BRANCH_NAME
-            cd $PWD@script/api;mvn versions:set -DnewVersion=$BRANCH_NAME
-            mvn clean package
-        '''
+        if(env.BRANCH_NAME=="master") {
+            version = sh(returnStdout: true, script: 'git describe --abbrev=0 --tags').trim()
+            checkout([$class: 'GitSCM', branches: [[name: "tags/${version}"]], extensions: [[$class: 'CleanCheckout']]])
+        }
+        
+        sh """
+        cd api
+        mvn versions:set -DnewVersion=${version}
+        mvn clean package
+        """
 
         stage 'Test'
         sh '''
-        cd $PWD@script/api/src/main/resources/; 
+        cd api/src/main/resources
         pylint_wrapper.py 10
         nosetests test_*.py
         '''
 
         stage 'Deploy' 
-        build job: 'deploy-component', parameters: [[$class: 'StringParameterValue', name: 'branch', value: env.BRANCH_NAME],[$class: 'StringParameterValue', name: 'component', value: "deployment-manager"],[$class: 'StringParameterValue', name: 'release_path', value: "platform/releases"],[$class: 'StringParameterValue', name: 'release', value: "${workspace}@script/api/target/deployment-manager-${env.BRANCH_NAME}.tar.gz"]]
+        build job: 'deploy-component', parameters: [[$class: 'StringParameterValue', name: 'branch', value: env.BRANCH_NAME],[$class: 'StringParameterValue', name: 'component', value: "deployment-manager"],[$class: 'StringParameterValue', name: 'release_path', value: "platform/releases"],[$class: 'StringParameterValue', name: 'release', value: "${workspace}/api/target/deployment-manager-${version}.tar.gz"]]
 
         emailext attachLog: true, body: "Build succeeded (see ${env.BUILD_URL})", subject: "[JENKINS] ${env.JOB_NAME} succeeded", to: "${env.EMAIL_RECIPIENTS}"