diff --git a/CHANGELOG.md b/CHANGELOG.md index d1239400..a3e0905a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -6.0.1 / Work in Progress -======================== +6.0.1 / 2018-10-01 +================== New functionality added in a backwards-compatible manner: * [OLMIS-5235:](https://openlmis.atlassian.net/browse/OLMIS-5235): Extended LocalDatabase class: diff --git a/Jenkinsfile b/Jenkinsfile index e0782310..2a11def2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -142,7 +142,7 @@ pipeline { success { script { if (!VERSION.endsWith("SNAPSHOT")) { - currentBuild.rawBuild.keepLog(true) + currentBuild.setKeepLog(true) } } } @@ -156,13 +156,21 @@ pipeline { } post { fixed { - slackSend color: 'good', message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} Back to normal" + script { + BRANCH = "${env.GIT_BRANCH}".trim() + if (BRANCH.equals("master") || BRANCH.startsWith("rel-")) { + slackSend color: 'good', message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} Back to normal" + } + } } } } def notifyAfterFailure() { - slackSend color: 'danger', message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} ${env.STAGE_NAME} FAILED (<${env.BUILD_URL}|Open>)" + BRANCH = "${env.GIT_BRANCH}".trim() + if (BRANCH.equals("master") || BRANCH.startsWith("rel-")) { + slackSend color: 'danger', message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} ${env.STAGE_NAME} FAILED (<${env.BUILD_URL}|Open>)" + } emailext subject: "${env.JOB_NAME} - #${env.BUILD_NUMBER} ${env.STAGE_NAME} FAILED", body: """

${env.JOB_NAME} - #${env.BUILD_NUMBER} ${env.STAGE_NAME} FAILED

Check console output to view the results.

""", recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'DevelopersRecipientProvider']] diff --git a/docker-compose.yml b/docker-compose.yml index a9c2ce1a..6182545d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "2" services: ui-components: - image: openlmis/dev-ui:8.0.1-SNAPSHOT + image: openlmis/dev-ui:8.0.1 ports: - "9000:9000" - "9876:9876" diff --git a/project.properties b/project.properties index 22502c07..8ca72641 100755 --- a/project.properties +++ b/project.properties @@ -1,4 +1,4 @@ -version=6.0.1-SNAPSHOT +version=6.0.1 projectName=OpenLMIS UI Components projectKey=ui-components transifexProject=openlmis-ui-components