Skip to content

Commit

Permalink
[FABCI-397] Remove AnsiColor wrapper
Browse files Browse the repository at this point in the history 
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
Change-Id: I90f5dc38c8917d99be0a2e9438cb77ea2660d818
  • Loading branch information
Brett Logan authored and Brett Logan committed Aug 21, 2019
1 parent cd5ed8f commit 410f657
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
24 changes: 12 additions & 12 deletions Jenkinsfile.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ node ('hyp-x') { // trigger build on x86_64 node
}
// clean environment and get env data
stage("Clean Environment - Get Env Info") {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --clean_Environment --env_Info'
Expand All @@ -85,11 +85,11 @@ node ('hyp-x') { // trigger build on x86_64 node
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}
// Pull Fabric, Fabric-ca Images
stage("Pull Docker Images") {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --pull_Docker_Images'
Expand All @@ -100,11 +100,11 @@ node ('hyp-x') { // trigger build on x86_64 node
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}
// Run gulp tests (e2e tests)
stage("Run Headless & E2E tests") {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --e2e_Tests'
Expand All @@ -115,7 +115,7 @@ node ('hyp-x') { // trigger build on x86_64 node
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}

// Publish hyperledger/fabric-nodeenv image from merged job only
Expand Down Expand Up @@ -159,7 +159,7 @@ def publishNpm() {
withCredentials([[$class : 'StringBinding',
credentialsId: 'NPM_LOCAL',
variable : 'NPM_TOKEN']]) {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --publish_NpmModules'
Expand All @@ -170,7 +170,7 @@ def publishNpm() {
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}
}
}
Expand All @@ -183,7 +183,7 @@ def apiDocs() {
credentialsId: 'chaincode-node-credentials',
usernameVariable: 'CHAINCODE_NODE_USERNAME',
passwordVariable: 'CHAINCODE_NODE_PASSWORD']]) {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --publish_ApiDocs'
Expand All @@ -194,7 +194,7 @@ def apiDocs() {
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}
}
}
Expand All @@ -204,7 +204,7 @@ def publishNodeenv() {
stage("Publish nodeenv image") {
def ROOTDIR = pwd()
configFileProvider([configFile(fileId: 'fabric-settings', variable: 'SETTINGS_FILE')]) {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --publish_Nodeenv_Image'
Expand All @@ -215,7 +215,7 @@ def publishNodeenv() {
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}
}
}
16 changes: 8 additions & 8 deletions Jenkinsfile.z
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ node('hyp-z') {
}
// clean environment and get env data
stage("Clean Environment - Get Env Info") {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --clean_Environment --env_Info'
Expand All @@ -84,12 +84,12 @@ node('hyp-z') {
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}

// Pull Fabric, Fabric-ca Images
stage("Pull Docker Images") {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --pull_Docker_Images'
Expand All @@ -100,12 +100,12 @@ node('hyp-z') {
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}

// Run gulp tests (e2e tests)
stage("Run Headless & E2E Tests") {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --e2e_Tests'
Expand All @@ -116,7 +116,7 @@ node('hyp-z') {
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}

// Publish hyperledger/fabric-nodeenv image from merged job only
Expand All @@ -143,7 +143,7 @@ def publishNodeenv() {
stage("Publish nodeenv image") {
def ROOTDIR = pwd()
configFileProvider([configFile(fileId: 'fabric-settings', variable: 'SETTINGS_FILE')]) {
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
try {
dir("${ROOTDIR}/$PROJECT_DIR/fabric-chaincode-node/scripts/Jenkins_Scripts") {
sh './CI_Script.sh --publish_Nodeenv_Image'
Expand All @@ -154,7 +154,7 @@ def publishNodeenv() {
currentBuild.result = 'FAILURE'
throw err
}
}
// }
}
}
}

0 comments on commit 410f657

Please sign in to comment.