Skip channels delete when uyuni

Author: maximenoel8

jenkins_pipelines/environments/common/pipeline-build-validation-cleanup.groovy

@@ -85,33 +85,40 @@ def run(params) {
             }
 
             stage('Delete the systems') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_systems ${defaultResourcesToDeleteArgs}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_systems")
             }
             stage('Delete config projects') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_config_projects ${defaultResourcesToDeleteArgs}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_config_projects")
             }
+
             stage('Delete software channels') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_software_channels ${defaultResourcesToDeleteArgs}")
+                when {
+                    expression { product_version != "uyuni" }
+                }
+                steps {
+                    sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_software_channels")
+                }
             }
+
             stage('Delete activation keys') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_activation_keys ${defaultResourcesToDeleteArgs}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_activation_keys")
             }
             stage('Delete minion users') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_users ${defaultResourcesToDeleteArgs}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_users")
             }
             stage('Delete channel repositories') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_repositories ${defaultResourcesToDeleteArgs}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_repositories")
             }
             stage('Delete salt keys') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_salt_keys ${defaultResourcesToDeleteArgs}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} ${defaultResourcesToDeleteArgs} --mode delete_salt_keys")
             }
 
             stage('Delete ssh know hosts') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_known_hosts --product_version ${product_version}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} --mode delete_known_hosts")
             }
 
             stage('Delete distributions folders') {
-                sh(script: "${api_program} --url ${params.manager_hostname} --mode delete_distributions --product_version ${product_version}")
+                sh(script: "${api_program} --url ${params.manager_hostname} --product_version ${product_version} --mode delete_distributions")
             }
 
             // Define shared environment variables for terraform calls

jenkins_pipelines/scripts/SUSEManager_cleaner/suse_manager_cleaner_program/SUSEManagerCleaner.py

@@ -24,7 +24,7 @@ def main():
     parser.add_argument("--default-resources-to-delete", type=str, nargs='*',
                         choices=['proxy', 'monitoring-server', 'retail'],
                         default=[], help='List of default modules to force deletion')
-    parser.add_argument("--product_version", type=str, choices=['5.0', '4.3', 'uyuni'])
+    parser.add_argument("--product_version", required=True, type=str, choices=['5.0', '4.3', 'uyuni'])
 
     args = parser.parse_args()
     manager_url = args.url
@@ -33,7 +33,7 @@ def main():
     if args.mode in ["delete_users", "delete_activation_keys", "delete_config_projects",
                      "delete_software_channels", "delete_systems", "delete_repositories",
                      "full_cleanup", "delete_salt_keys"]:
-        resource_manager = ResourceManager(manager_url, args.default_resources_to_delete)
+        resource_manager = ResourceManager(manager_url, args.default_resources_to_delete, args.product_version)
         resource_manager.get_session_key()
         mode_actions = {
             "delete_users": resource_manager.delete_users,

jenkins_pipelines/scripts/SUSEManager_cleaner/suse_manager_cleaner_program/suse_manager_api.py

@@ -10,9 +10,10 @@
 password = "admin"
 
 class ResourceManager:
-    def __init__(self, manager_url, resources_to_delete):
+    def __init__(self, manager_url, resources_to_delete, product_version):
         self.manager_url = manager_url
         self.resources_to_delete = {"proxy", "monitoring", "build"} - set(resources_to_delete)
+        self.product_version = product_version
         self.client = None
         self.session_key = None
 
@@ -46,6 +47,10 @@ def delete_config_projects(self):
             self.client.contentmanagement.removeProject(self.session_key, project['label'])
 
     def delete_software_channels(self):
+        if self.product_version == "uyuni":
+            logging.warning("Delete channels not supported for uyuni")
+            return  # Exit early if deletion is not supported
+
         channels = self.client.channel.listMyChannels(self.session_key)
         for channel in channels:
             details = self.client.channel.software.getDetails(self.session_key, channel['label'])