diff --git a/Jenkinsfile b/Jenkinsfile index cd42cb3..b130700 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -81,41 +81,14 @@ pipeline { allOf{ triggeredBy 'TimerTrigger' // maybe we can add a new condition in order to consider the manual execution of this pipeline - environment name: 'IS_CRON', value: 'True' + environment name: 'IS_SCHEDULED', value: 'True' } } steps { echo 'Cron build enabled. Deploy from system ongoing' script { def deployFolder="CD-${env.BUILD_NUMBER}"; - println ("searching files in folder ${deployFolder}"); - def files = findFiles(glob: "${deployFolder}/*.csv") - if (files == null){ - println ("Nothing to do"); - }else{ - def serviceList = [] - for (def file : files){ - def records = readCSV file: "${file.path}" - for (def record : records) { - println("Processing record: "+record) - if(!serviceList.contains(record.get(0))){ - stage(record.get(0)){ - println "Deploy on going of component: ${record.get(0)}" - catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { - checkup(record.get(0), record.get(1), record.get(2)); - deploy(record.get(0), record.get(1), record.get(2)); - } - } - serviceList << record.get(0) - }else{ - echo "${record.get(0)} already deployed. Deployment skipped." - } - - } - sh "rm ${file.path}" - } - sh "rm -Rf ${deployFolder}" - } + deployPendingJobs(deployFolder); } @@ -126,7 +99,7 @@ pipeline { anyOf{ allOf{ triggeredBy 'TimerTrigger' - environment name: 'IS_CRON', value: 'False' + environment name: 'IS_SCHEDULED', value: 'False' } } @@ -137,7 +110,7 @@ pipeline { } stage('New pending deploy ') { when{ - environment name: 'IS_CRON', value: 'True' + environment name: 'IS_SCHEDULED', value: 'True' anyOf{ triggeredBy 'BuildUpstreamCause' triggeredBy 'UpstreamCause' @@ -164,7 +137,7 @@ pipeline { } stage('Deploy from job ') { when{ - environment name: 'IS_CRON', value: 'False'; + environment name: 'IS_SCHEDULED', value: 'False'; expression { env.TRIGGER_CD.toBoolean() } @@ -187,7 +160,7 @@ pipeline { stage('Deploy manually ') { when{ allOf{ - environment name: 'IS_CRON', value: 'False'; + environment name: 'IS_SCHEDULED', value: 'False'; triggeredBy 'UserIdCause' } } @@ -251,3 +224,37 @@ def checkup(String service, String version, String host){ esac """) } + + +//parse all csv files found in the local folder and deploy the components defined inside +def deployPendingJobs( def deployFolder){ + println ("searching files in folder ${deployFolder}"); + def files = findFiles(glob: "${deployFolder}/*.csv") + if (files == null){ + println ("Nothing to do"); + }else{ + def serviceList = [] + for (def file : files){ + def records = readCSV file: "${file.path}" + for (def record : records) { + println("Processing record: "+record) + if(!serviceList.contains(record.get(0))){ + stage(record.get(0)){ + println "Deploy on going of component: ${record.get(0)}" + catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { + checkup(record.get(0), record.get(1), record.get(2)); + deploy(record.get(0), record.get(1), record.get(2)); + } + } + serviceList << record.get(0) + }else{ + echo "${record.get(0)} already deployed. Deployment skipped." + } + + } + sh "rm ${file.path}" + } + sh "rm -Rf ${deployFolder}" + } +} +