From d2ccba5770d60a06d69d87465f66fe0ec21af9d0 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Wed, 26 Apr 2023 15:55:34 +0200
Subject: [PATCH] fix echo

---
 Jenkinsfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b9b66a7..6fded55 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,7 +126,7 @@ pipeline {
             	}
             }
             steps {
-                echo 'Cron build enabled. Deploy from system ongoing'
+                echo 'Cron build enabled. \033[31;1;4mDeploy from system ongoing\033[0m'
                 script {
                 	echo "pipeline was triggered by ${params.TRIGGER_JOB}"
             		println("Going to deploy all the pending deployments")
@@ -160,7 +160,8 @@ pipeline {
             }
             steps {
                 sh '''
-                   echo 'Cron build enabled. \033[31;1;4mNew deploy of ${TRIGGER_JOB} - ${TRIGGER_VERSION} will be added to the pending deploy file\033[0m'
+                   echo '\033[31;1;4mNew pending deploy added to the queue/033[0m'
+                   echo "Cron build enabled. Adding ${TRIGGER_JOB} - ${TRIGGER_VERSION} to the queue"
                    touch $DEPLOY_FILE;
                    if grep -q \"\${TRIGGER_JOB}\" \${DEPLOY_FILE}; then
                        echo "component ${TRIGGER_JOB} already added. Nothing to add."                      
@@ -191,7 +192,8 @@ pipeline {
             }
             steps {
             	script{
-	                 echo 'Cron build disabled. \033[31;1;4mNew deploy of ${params.TRIGGER_JOB} - ${params.TRIGGER_VERSION} ongoing\033[0m'
+            	     echo '\033[31;1;4mNew upstream deploy ongoing\033[0m'
+	                 echo "Cron build disabled. Component: ${params.TRIGGER_JOB} - ${params.TRIGGER_VERSION}"
 	                 ansiColor('xterm') {
 	                 	 catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
 	                         checkup("${params.TRIGGER_JOB}", "${params.TRIGGER_VERSION}", "${params.TRIGGER_HOST}");
@@ -232,13 +234,11 @@ pipeline {
                 expression { params.TRIGGER_JOB != "${RELEASE_JOB}" }
             }
             steps {
-                 echo 'Cron build disabled. Pipeline executed Manually. \033[31;1;4mNew deploy of ${params.TRIGGER_JOB} - ${params.TRIGGER_VERSION} ongoing\033[0m'
-                 ansiColor('xterm') {
-                     catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                         deploy("${params.TRIGGER_JOB}", "${params.TRIGGER_VERSION}", "${params.TRIGGER_HOST}");
-                     }
+                 echo '\033[31;1;4mNew deploy ongoing manually triggered\033[0m'
+                 echo "Cron build disabled. Pipeline executed Manually. New deploy of ${params.TRIGGER_JOB} - ${params.TRIGGER_VERSION} ongoing"
+                 catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                     deploy("${params.TRIGGER_JOB}", "${params.TRIGGER_VERSION}", "${params.TRIGGER_HOST}");
                  }
-
             }
         }
     }