From fdb2c09d62b19f3669e2927333f20bb59fa25b8a Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 18 Jul 2024 08:46:33 +0200 Subject: [PATCH] add Checks::Pulpcore::NoRunningTasks to update/upgrade scenarios --- definitions/scenarios/foreman_upgrade.rb | 1 + definitions/scenarios/satellite_upgrade.rb | 1 + definitions/scenarios/update.rb | 1 + test/definitions/scenarios/capsule_upgrade_test.rb | 2 ++ test/definitions/scenarios/foreman_upgrade_test.rb | 2 ++ test/definitions/scenarios/katello_upgrade_test.rb | 2 ++ test/definitions/scenarios/satellite_upgrade_test.rb | 2 ++ 7 files changed, 11 insertions(+) diff --git a/definitions/scenarios/foreman_upgrade.rb b/definitions/scenarios/foreman_upgrade.rb index 4a793794c..b3a22dd69 100644 --- a/definitions/scenarios/foreman_upgrade.rb +++ b/definitions/scenarios/foreman_upgrade.rb @@ -48,6 +48,7 @@ def compose Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks Checks::ForemanTasks::NotRunning, # if foreman-tasks + Checks::Pulpcore::NoRunningTasks, # if pulpcore Checks::NonRhPackages, Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Repositories::CheckNonRhRepository, diff --git a/definitions/scenarios/satellite_upgrade.rb b/definitions/scenarios/satellite_upgrade.rb index 21dc1bd75..6036aac82 100644 --- a/definitions/scenarios/satellite_upgrade.rb +++ b/definitions/scenarios/satellite_upgrade.rb @@ -48,6 +48,7 @@ def compose Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks Checks::ForemanTasks::NotRunning, # if foreman-tasks + Checks::Pulpcore::NoRunningTasks, # if pulpcore Checks::NonRhPackages, Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Repositories::CheckNonRhRepository, diff --git a/definitions/scenarios/update.rb b/definitions/scenarios/update.rb index 67403092c..53b0dae60 100644 --- a/definitions/scenarios/update.rb +++ b/definitions/scenarios/update.rb @@ -46,6 +46,7 @@ def compose Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks Checks::ForemanTasks::NotRunning, # if foreman-tasks + Checks::Pulpcore::NoRunningTasks, # if pulpcore Checks::NonRhPackages, Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Repositories::CheckNonRhRepository, diff --git a/test/definitions/scenarios/capsule_upgrade_test.rb b/test/definitions/scenarios/capsule_upgrade_test.rb index 3195dc265..7fae9195d 100644 --- a/test/definitions/scenarios/capsule_upgrade_test.rb +++ b/test/definitions/scenarios/capsule_upgrade_test.rb @@ -32,6 +32,7 @@ Checks::Disk::AvailableSpacePostgresql13, Checks::CheckOrganizationContentAccessMode, Checks::Repositories::Validate, + Checks::Pulpcore::NoRunningTasks, ) end @@ -54,6 +55,7 @@ Checks::Disk::AvailableSpacePostgresql13, Checks::CheckOrganizationContentAccessMode, Checks::Repositories::Validate, + Checks::Pulpcore::NoRunningTasks, ) end end diff --git a/test/definitions/scenarios/foreman_upgrade_test.rb b/test/definitions/scenarios/foreman_upgrade_test.rb index 7855c0284..9ed458bb2 100644 --- a/test/definitions/scenarios/foreman_upgrade_test.rb +++ b/test/definitions/scenarios/foreman_upgrade_test.rb @@ -27,6 +27,7 @@ Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Disk::AvailableSpacePostgresql13, Checks::Repositories::Validate, + Checks::Pulpcore::NoRunningTasks, ) end @@ -45,6 +46,7 @@ Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Disk::AvailableSpacePostgresql13, Checks::Repositories::Validate, + Checks::Pulpcore::NoRunningTasks, ) end end diff --git a/test/definitions/scenarios/katello_upgrade_test.rb b/test/definitions/scenarios/katello_upgrade_test.rb index faffb257a..dbfb317e3 100644 --- a/test/definitions/scenarios/katello_upgrade_test.rb +++ b/test/definitions/scenarios/katello_upgrade_test.rb @@ -34,6 +34,7 @@ Checks::ForemanTasks::Invalid::CheckPendingState, Checks::ForemanTasks::Invalid::CheckPlanningState, Checks::ForemanTasks::NotRunning, + Checks::Pulpcore::NoRunningTasks, Checks::NonRhPackages, Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Repositories::CheckNonRhRepository, @@ -65,6 +66,7 @@ Checks::ForemanTasks::Invalid::CheckPendingState, Checks::ForemanTasks::Invalid::CheckPlanningState, Checks::ForemanTasks::NotRunning, + Checks::Pulpcore::NoRunningTasks, Checks::NonRhPackages, Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Repositories::CheckNonRhRepository, diff --git a/test/definitions/scenarios/satellite_upgrade_test.rb b/test/definitions/scenarios/satellite_upgrade_test.rb index 55bf40871..7b7779864 100644 --- a/test/definitions/scenarios/satellite_upgrade_test.rb +++ b/test/definitions/scenarios/satellite_upgrade_test.rb @@ -35,6 +35,7 @@ Checks::ForemanTasks::Invalid::CheckPendingState, Checks::ForemanTasks::Invalid::CheckPlanningState, Checks::ForemanTasks::NotRunning, + Checks::Pulpcore::NoRunningTasks, Checks::NonRhPackages, Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Repositories::CheckNonRhRepository, @@ -67,6 +68,7 @@ Checks::ForemanTasks::Invalid::CheckPendingState, Checks::ForemanTasks::Invalid::CheckPlanningState, Checks::ForemanTasks::NotRunning, + Checks::Pulpcore::NoRunningTasks, Checks::NonRhPackages, Checks::PackageManager::Dnf::ValidateDnfConfig, Checks::Repositories::CheckNonRhRepository,