diff --git a/jenkins_pipelines/environments/common/pipeline-build-validation-cleanup.groovy b/jenkins_pipelines/environments/common/pipeline-build-validation-cleanup.groovy index 6b04b76b9..7f23f48f8 100644 --- a/jenkins_pipelines/environments/common/pipeline-build-validation-cleanup.groovy +++ b/jenkins_pipelines/environments/common/pipeline-build-validation-cleanup.groovy @@ -100,21 +100,21 @@ def run(params) { stage("Extract the controller and server hostname") { try { controllerHostname = sh( - script: """ + script: """ set -e cd ${localSumaformDirPath} terraform output -json configuration | jq -r '.controller.hostname' """, - returnStdout: true + returnStdout: true ).trim() serverHostname = sh( - script: """ + script: """ set -e cd ${localSumaformDirPath} terraform output -json configuration | jq -r '.server.hostname' """, - returnStdout: true + returnStdout: true ).trim() // Print the values for confirmation @@ -134,9 +134,7 @@ def run(params) { } stage('Delete software channels') { - if (product_version != "uyuni") { - sh(script: "${SUSEManagerCleanerProgram} --url ${serverHostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_software_channels") - } + sh(script: "${SUSEManagerCleanerProgram} --url ${serverHostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_software_channels") } stage('Delete activation keys') {