From d3ada6f1b0fd7a8afc19f3cde8ef8a6607c7b682 Mon Sep 17 00:00:00 2001 From: rameshthoomu Date: Tue, 6 Nov 2018 12:26:37 -0500 Subject: [PATCH] FABN-997 Update pipeline script Change-Id: I49eabaf784b81f55f4606651b8e563b35cacbbef Signed-off-by: rameshthoomu --- Jenkinsfile.x | 4 ++-- Jenkinsfile.z | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile.x b/Jenkinsfile.x index 3680720c5a..223b865b7c 100644 --- a/Jenkinsfile.x +++ b/Jenkinsfile.x @@ -85,14 +85,14 @@ node ('hyp-x') { // trigger build on x86_64 node if (env.GERRIT_EVENT_TYPE == "change-merged") { publishNpm() } else { - echo -e "\033[32m ------> Dont publish npm modules from verify job" "\033[0m" + echo "------> Don't publish npm modules from VERIFY job" } // Publish API Docs from merged job only if (env.GERRIT_EVENT_TYPE == "change-merged") { apiDocs() } else { - echo -e ""\033[32m" ------> Don't publish API Docs from verify job" "\033[0m" + echo "------> Don't publish API Docs from VERIFY job" } } finally { // Code for coverage report diff --git a/Jenkinsfile.z b/Jenkinsfile.z index f7ba4ac21c..7d0b220378 100644 --- a/Jenkinsfile.z +++ b/Jenkinsfile.z @@ -38,6 +38,7 @@ node('hyp-z') { } // clean environment and get env data stage("Clean Environment - Get Env Info") { + wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) { try { dir("${ROOTDIR}/$PROJECT_DIR/fabric-sdk-node/scripts/Jenkins_Scripts") { sh './CI_Script.sh --clean_Environment --env_Info' @@ -49,6 +50,7 @@ node('hyp-z') { throw err } } + } // Pull fabric, fabric-ca Docker Images stage("Pull Docker Images") { @@ -85,7 +87,7 @@ node('hyp-z') { archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' if (env.GERRIT_EVENT_TYPE == 'change-merged') { if (currentBuild.result == 'FAILURE') { // Other values: SUCCESS, UNSTABLE - rocketSend channel: "Build Notification - STATUS: ${currentBuild.result} - BRANCH: ${env.GERRIT_BRANCH} - PROJECT: ${env.PROJECT} - BUILD_URL: (<${env.BUILD_URL}|Open>)" + rocketSend "Build Notification - STATUS: ${currentBuild.result} - BRANCH: ${env.GERRIT_BRANCH} - PROJECT: ${env.PROJECT} - BUILD_URL: (<${env.BUILD_URL}|Open>)" } } } // finally block end here