From 84d9b1402d6333351707c8d6bfb45a70a8c7a20f Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Mon, 9 Sep 2024 16:55:31 +0200 Subject: [PATCH] Remove `@scope_traditional_client` in Uyuni and 5.0 Signed-off-by: Dominik Gedon --- .../environments/manager-5.0-dev-acceptance-tests-NUE | 2 +- .../environments/manager-5.0-dev-acceptance-tests-PRV | 2 +- .../environments/manager-Head-dev-acceptance-tests-NUE | 2 +- .../uyuni-master-dev-acceptance-tests-code-coverage | 6 +++--- .../environments/uyuni-master-dev-acceptance-tests-podman | 2 +- jenkins_pipelines/environments/uyuni-prs-ci-tests | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-NUE b/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-NUE index 4ee07dbd2..2bbb9cff9 100644 --- a/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-NUE +++ b/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-NUE @@ -22,7 +22,7 @@ node('sumaform-cucumber') { booleanParam(name: 'use_previous_terraform_state', defaultValue: true, description: 'Use previous Terraform state'), booleanParam(name: 'show_product_changes', defaultValue: true, description: 'Show the product changes since the last build'), choice(name: 'rake_namespace', choices: ['cucumber', 'parallel'], description: 'Choose [parallel] (Clients and some features will run in parallel) or [cucumber] (all sequential)'), - extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_traditional_client,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') + extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') ]) ]) diff --git a/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-PRV b/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-PRV index 3e43f1229..ba8a484b8 100644 --- a/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-PRV +++ b/jenkins_pipelines/environments/manager-5.0-dev-acceptance-tests-PRV @@ -22,7 +22,7 @@ node('sumaform-cucumber-provo') { booleanParam(name: 'use_previous_terraform_state', defaultValue: true, description: 'Use previous Terraform state'), booleanParam(name: 'show_product_changes', defaultValue: true, description: 'Show the product changes since the last build'), choice(name: 'rake_namespace', choices: ['cucumber', 'parallel'], description: 'Choose [parallel] (Clients and some features will run in parallel) or [cucumber] (all sequential)'), - extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_traditional_client,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') + extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') ]) ]) diff --git a/jenkins_pipelines/environments/manager-Head-dev-acceptance-tests-NUE b/jenkins_pipelines/environments/manager-Head-dev-acceptance-tests-NUE index c8c0e9a3d..2cfa7c7d9 100644 --- a/jenkins_pipelines/environments/manager-Head-dev-acceptance-tests-NUE +++ b/jenkins_pipelines/environments/manager-Head-dev-acceptance-tests-NUE @@ -22,7 +22,7 @@ node('sumaform-cucumber') { booleanParam(name: 'use_previous_terraform_state', defaultValue: true, description: 'Use previous Terraform state'), booleanParam(name: 'show_product_changes', defaultValue: true, description: 'Show the product changes since the last build'), choice(name: 'rake_namespace', choices: ['cucumber', 'parallel'], description: 'Choose [parallel] (Clients and some features will run in parallel) or [cucumber] (all sequential)'), - extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_traditional_client,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') + extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') ]) ]) diff --git a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage index 610a7ccc8..723e18f47 100644 --- a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage +++ b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage @@ -19,7 +19,7 @@ node('sumaform-cucumber-provo') { booleanParam(name: 'terraform_taint', defaultValue: true, description: 'Call terraform taint (so the resources, except volumes, are recreated)'), choice(name: 'rake_namespace', choices: ['cucumber', 'parallel'], description: 'Choose [parallel] (Clients and some features will run in parallel) or [cucumber] (all sequential)'), booleanParam(name: 'use_previous_terraform_state', defaultValue: true, description: 'Use previous Terraform state'), - extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_traditional_client,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') + extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') ]) ]) @@ -44,10 +44,10 @@ node('sumaform-cucumber-provo') { dir("susemanager-ci") { checkout scm } - + // Create a directory for to place the directory with the build results (if it does not exist) sh "mkdir -p ${resultdir}" - + // Clone sumaform sh "set +x; source /home/jenkins/.credentials set -x; ./terracumber-cli ${common_params} --gitrepo ${params.sumaform_gitrepo} --gitref ${params.sumaform_ref} --runstep gitsync" diff --git a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-podman b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-podman index 78b84d5d0..1b9b72858 100644 --- a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-podman +++ b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-podman @@ -22,7 +22,7 @@ node('sumaform-cucumber') { booleanParam(name: 'use_previous_terraform_state', defaultValue: true, description: 'Use previous Terraform state'), booleanParam(name: 'show_product_changes', defaultValue: false, description: 'Show the product changes since the last build'), choice(name: 'rake_namespace', choices: ['cucumber', 'parallel'], description: 'Choose [parallel] (Clients and some features will run in parallel) or [cucumber] (all sequential)'), - extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_traditional_client,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') + extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ',', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_smdba,@scope_spacecmd,@scope_spacewalk_utils,@scope_visualization,@scope_notification_message,@scope_virtual_host_manager,@scope_subscription_matching,@scope_formulas,@scope_sp_migration,@scope_cve_audit,@scope_onboarding,@scope_content_lifecycle_management,@scope_res,@scope_recurring_actions,@scope_maintenance_windows,@scope_building_container_images,@scope_kubernetes_integration,@scope_openscap,@scope_deblike,@scope_action_chains,@scope_salt_ssh,@scope_tomcat,@scope_changing_software_channels,@scope_monitoring,@scope_salt,@scope_cobbler,@scope_sumatoolbox,@scope_virtualization,@scope_hub,@scope_retail,@scope_configuration_channels,@scope_content_staging,@scope_proxy,@scope_api,@scope_power_management,@scope_retracted_patches,@scope_ansible,@scope_reportdb,@scope_containerized_proxy', description: 'Choose the functional scopes that you want to test') ]) ]) diff --git a/jenkins_pipelines/environments/uyuni-prs-ci-tests b/jenkins_pipelines/environments/uyuni-prs-ci-tests index c9f39a583..df5f207fa 100644 --- a/jenkins_pipelines/environments/uyuni-prs-ci-tests +++ b/jenkins_pipelines/environments/uyuni-prs-ci-tests @@ -9,7 +9,7 @@ node('pull-request-test') { string(name: 'pull_request_number', defaultValue: '', description: 'Required: Uyuni Pull Request Number'), string(name: 'email_to', defaultValue: '', description: 'Recommended: Receive a report to your e-mail when it finishes with links to the results, artifacts and logs'), booleanParam(name: 'run_all_scopes', defaultValue: false, description: 'Secondary tests: Check to run all functional scopes. List of secondary tests: https://github.com/uyuni-project/uyuni/blob/master/testsuite/features/secondary/ '), - extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ' or ', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_action_chains,@scope_ansible,@scope_api,@scope_building_container_images,@scope_changing_software_channels,@scope_cobbler,@scope_configuration_channels,@scope_containerized_proxy,@scope_content_lifecycle_management,@scope_content_staging,@scope_cve_audit,@scope_deblike,@scope_formulas,@scope_hub,@scope_kubernetes_integration,@scope_maintenance_windows,@scope_monitoring,@scope_notification_message,@scope_onboarding,@scope_openscap,@scope_power_management,@scope_proxy,@scope_recurring_actions,@scope_reportdb,@scope_res,@scope_retail,@scope_retracted_patches,@scope_salt,@scope_salt_ssh,@scope_smdba,@scope_sp_migration,@scope_spacecmd,@scope_spacewalk_utils,@scope_subscription_matching,@scope_sumatoolbox,@scope_tomcat,@scope_traditional_client,@scope_virtual_host_manager,@scope_virtualization,@scope_visualization', description: 'Secondary tests: choose the functional scopes that you want to test.'), + extendedChoice(name: 'functional_scopes', multiSelectDelimiter: ' or ', quoteValue: false, saveJSONParameterToFile: false, type: 'PT_CHECKBOX', visibleItemCount: 30, value: '@scope_action_chains,@scope_ansible,@scope_api,@scope_building_container_images,@scope_changing_software_channels,@scope_cobbler,@scope_configuration_channels,@scope_containerized_proxy,@scope_content_lifecycle_management,@scope_content_staging,@scope_cve_audit,@scope_deblike,@scope_formulas,@scope_hub,@scope_kubernetes_integration,@scope_maintenance_windows,@scope_monitoring,@scope_notification_message,@scope_onboarding,@scope_openscap,@scope_power_management,@scope_proxy,@scope_recurring_actions,@scope_reportdb,@scope_res,@scope_retail,@scope_retracted_patches,@scope_salt,@scope_salt_ssh,@scope_smdba,@scope_sp_migration,@scope_spacecmd,@scope_spacewalk_utils,@scope_subscription_matching,@scope_sumatoolbox,@scope_tomcat,@scope_virtual_host_manager,@scope_virtualization,@scope_visualization', description: 'Secondary tests: choose the functional scopes that you want to test.'), booleanParam(name: 'must_build', defaultValue: true, description: 'Advanced: Uncheck this if you want to reuse a previous build packages from the build service'), //booleanParam(name: 'must_test', defaultValue: true, description: 'Advanced: Uncheck this if you do not want to run any tests'), booleanParam(name: 'remove_previous_environment', defaultValue: true, description: 'Advanced: Uncheck this if you do not want to remove your previous environment for this same PR'), @@ -18,7 +18,7 @@ node('pull-request-test') { string(name: 'additional_repo_url', defaultValue: '', description: 'Advanced: Add the URL of an additional repo to test new packages or package updates (only for server, proxy, kvm host).'), string(name: 'terraform_parallelism', defaultValue: '', description: 'Advanced: Define the number of parallel resource operations for terraform'), booleanParam(name: 'force_pr_lock_cleanup', defaultValue: false, description: 'Advanced: Check this parameter to force a cleanup of the locks associated with this PR. Be careful, only do this if you are certain no one else is running a test for the same PR. More at https://github.com/SUSE/spacewalk/wiki/How-to-run-the-test-suite-on-a-given-Pull-Request#troubleshooting'), - booleanParam(name: 'skip_package_build_check', defaultValue: false, description: 'Advanced: Check this parameter to skip checking if packages build correctly in systemsmanagement:Uyuni:Master. Do this when you are fixing a package build with your PR.'), + booleanParam(name: 'skip_package_build_check', defaultValue: false, description: 'Advanced: Check this parameter to skip checking if packages build correctly in systemsmanagement:Uyuni:Master. Do this when you are fixing a package build with your PR.'), ]) ])