diff --git a/Jenkinsfile.x b/Jenkinsfile.x index 223b865b7c..f7de06a08a 100644 --- a/Jenkinsfile.x +++ b/Jenkinsfile.x @@ -82,14 +82,14 @@ node ('hyp-x') { // trigger build on x86_64 node } // Publish npm modules from merged job -if (env.GERRIT_EVENT_TYPE == "change-merged") { +if (env.JOB_NAME == "fabric-sdk-node-merge-x86_64") { publishNpm() } else { echo "------> Don't publish npm modules from VERIFY job" } // Publish API Docs from merged job only -if (env.GERRIT_EVENT_TYPE == "change-merged") { +if (env.JOB_NAME == "fabric-sdk-node-merge-x86_64") { apiDocs() } else { echo "------> Don't publish API Docs from VERIFY job" @@ -98,7 +98,7 @@ if (env.GERRIT_EVENT_TYPE == "change-merged") { } finally { // Code for coverage report step([$class: 'CoberturaPublisher', autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: '**/cobertura-coverage.xml', failUnhealthy: false, failUnstable: false, failNoReports: false, maxNumberOfBuilds: 0, onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false]) archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' - if (env.GERRIT_EVENT_TYPE == "change-merged") { + if (env.JOB_NAME == "fabric-sdk-node-merge-x86_64") { if (currentBuild.result == 'FAILURE') { // Other values: SUCCESS, UNSTABLE rocketSend "Build Notification - STATUS: ${currentBuild.result} - BRANCH: ${env.GERRIT_BRANCH} - PROJECT: ${env.PROJECT} - BUILD_URL: (<${env.BUILD_URL}|Open>)" } diff --git a/Jenkinsfile.z b/Jenkinsfile.z index 7d0b220378..cfcd0b8101 100644 --- a/Jenkinsfile.z +++ b/Jenkinsfile.z @@ -85,7 +85,7 @@ node('hyp-z') { } } finally { // log artifacts archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' - if (env.GERRIT_EVENT_TYPE == 'change-merged') { + if (env.JOB_NAME == "fabric-sdk-node-merge-s390x") { if (currentBuild.result == 'FAILURE') { // Other values: SUCCESS, UNSTABLE rocketSend "Build Notification - STATUS: ${currentBuild.result} - BRANCH: ${env.GERRIT_BRANCH} - PROJECT: ${env.PROJECT} - BUILD_URL: (<${env.BUILD_URL}|Open>)" } diff --git a/scripts/Jenkins_Scripts/Publish_API_Docs.sh b/scripts/Jenkins_Scripts/Publish_API_Docs.sh index bf9a2b648f..1e637d02fb 100755 --- a/scripts/Jenkins_Scripts/Publish_API_Docs.sh +++ b/scripts/Jenkins_Scripts/Publish_API_Docs.sh @@ -12,6 +12,8 @@ gulp doc SDK_COMMIT=$(git rev-parse --short HEAD) echo "-------> SDK_COMMIT:" $SDK_COMMIT TARGET_REPO=$NODE_SDK_USERNAME.github.io.git +git config user.email "fabricsdknode@gmail.com" +git config user.name "fabricsdknode" # Clone SDK_NODE API doc repository git clone https://github.com/$NODE_SDK_USERNAME/$TARGET_REPO # Copy API docs to target repository & push to gh-pages URL