diff --git a/vars/applyConfigPolicy.groovy b/vars/applyConfigPolicy.groovy index 3297678..bd951df 100644 --- a/vars/applyConfigPolicy.groovy +++ b/vars/applyConfigPolicy.groovy @@ -9,7 +9,7 @@ def call(rw_pattern, stages) { ) image.inside { withEnv(["KRB5CCNAME=${WORKSPACE}/.krb5cc"]) { - this.stageKinit() + stageKinit() try { stageRemountRW(rw_pattern) generateStages(stages) @@ -26,20 +26,20 @@ def call(rw_pattern, stages) { } } -stageKinit() { +def stageKinit() { stage('kinit') { echo 'kinit' } } -stageRemountRW(rw_pattern) { +def stageRemountRW(rw_pattern) { stage('Remount R/W') { echo 'Remount R/W' } } -generateStages(stages) { +def generateStages(stages) { stages.each { name, playbooks -> stage(name) { playbooks.each { playbook -> @@ -49,16 +49,15 @@ generateStages(stages) { } } -stageRemountRO(rw_pattern) { +def stageRemountRO(rw_pattern) { echo 'Remount R/O' } - -postCleanup() { +def postCleanup() { echo 'Cleanup' } -postFailure(err) { +def postFailure(err) { currentBuild.result = 'FAILURE' echo "${err}" }