Skip to content

Commit

Permalink
Revert "QE: Fix Uyuni reposync for openSUSE Leap 15.4 (#7374)"
Browse files Browse the repository at this point in the history
This reverts commit ad75159.
  • Loading branch information
mbussolotto committed Aug 9, 2023
1 parent e868b41 commit 2dd763b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
7 changes: 1 addition & 6 deletions testsuite/features/support/commonlib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ def generate_temp_file(name, content)
# This is a safety net only, the best thing to do is to not start the reposync at all.
def compute_channels_to_leave_running
# keep the repos needed for the auto-installation tests
do_not_kill =
if $product == 'Uyuni'
CHANNEL_TO_SYNCH_BY_OS_VERSION['15.4']
else
CHANNEL_TO_SYNCH_BY_OS_VERSION['default']
end
do_not_kill = CHANNEL_TO_SYNCH_BY_OS_VERSION['default']
[$minion, $build_host, $ssh_minion, $rhlike_minion].each do |node|
next unless node
os_version = node.os_version
Expand Down
11 changes: 0 additions & 11 deletions testsuite/features/support/constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -428,17 +428,6 @@
res8-manager-tools-pool-x86_64
res8-manager-tools-updates-x86_64
sll8-uyuni-client-x86_64
],
'15.4' =>
%w[
opensuse_leap15_4-x86_64
opensuse_leap15_4-x86_64-non-oss
opensuse_leap15_4-x86_64-non-oss-updates
opensuse_leap15_4-x86_64-updates
opensuse_leap15_4-x86_64-backports-updates
opensuse_leap15_4-x86_64-sle-updates
uyuni-proxy-devel-leap-x86_64
opensuse_leap15_4-uyuni-client-x86_64
]
}.freeze

Expand Down

0 comments on commit 2dd763b

Please sign in to comment.