Skip to content

Commit

Permalink
Fix ubuntu 2004 reposync issue and 2204 reposync issue (#9333)
Browse files Browse the repository at this point in the history
* Fix ubuntu 2004 reposync issue and 2204 reposync issue
  • Loading branch information
maximenoel8 authored Oct 9, 2024
1 parent de0b604 commit 70281a7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
When I use spacewalk-common-channel to add all "rockylinux9" channels with arch "x86_64"
And I wait until all synchronized channels for "rockylinux9" have finished

@susemanager
@ubuntu2004_minion
Scenario: Add Ubuntu 20.04
Given I am authorized for the "Admin" section
Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/support/commonlib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def product_version
# @return [String, nil] The full product version if the command execution was successful and
# the output is not empty, otherwise nil.
def product_version_full
cmd = 'salt-call --local grains.get product_version | tail -n 1'
cmd = 'venv-salt-call --local grains.get product_version | tail -n 1'
out, code = get_target('server').run(cmd)
out.strip if code.zero? && !out.nil?
end
Expand Down
12 changes: 6 additions & 6 deletions testsuite/features/support/constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,8 @@
'Rocky Linux 8 (x86_64)' => 'rockylinux8-x86_64',
'Rocky Linux 9 (x86_64)' => 'rockylinux9-x86_64',
'Ubuntu 20.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2004-pool-amd64-uyuni',
'Ubuntu 22.04 LTS AMD64 Base for Uyuni' => 'ubuntu-22.04-pool-amd64-uyuni',
'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => 'ubuntu-24.04-pool-amd64-uyuni',
'Ubuntu 22.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2204-pool-amd64-uyuni',
'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2404-pool-amd64-uyuni',
'Debian 11 (bullseye) pool for amd64 for Uyuni' => 'debian-11-pool-amd64-uyuni',
'Debian 12 (bookworm) pool for amd64 for Uyuni' => 'debian-12-pool-amd64-uyuni',
'openSUSE Leap 15.5 (aarch64)' => 'opensuse_leap15_5-aarch64',
Expand Down Expand Up @@ -1314,7 +1314,7 @@
],
'ubuntu-2204' => # CHECKED
%w[
ubuntu-22.04-pool-amd64-uyuni
ubuntu-2204-pool-amd64-uyuni
ubuntu-2204-amd64-main-security-uyuni
ubuntu-2204-amd64-main-updates-uyuni
ubuntu-2204-amd64-main-uyuni
Expand All @@ -1326,7 +1326,7 @@
],
'ubuntu-2404' =>
%w[
ubuntu-24.04-pool-amd64-uyuni
ubuntu-2404-pool-amd64-uyuni
ubuntu-2404-amd64-main-security-uyuni
ubuntu-2404-amd64-main-updates-uyuni
ubuntu-2404-amd64-main-uyuni
Expand Down Expand Up @@ -1630,7 +1630,7 @@
'ubuntu-2204-amd64-universe-updates-uyuni' => 240,
'ubuntu-2204-amd64-universe-uyuni' => 24_000,
'ubuntu-2204-amd64-uyuni-client-devel' => 60,
'ubuntu-22.04-pool-amd64-uyuni' => 60,
'ubuntu-2204-pool-amd64-uyuni' => 60,
'ubuntu-22.04-suse-manager-tools-amd64' => 60,
'ubuntu-2404-amd64-main-amd64' => 780,
'ubuntu-2404-amd64-main-security-amd64' => 2760,
Expand All @@ -1643,7 +1643,7 @@
'ubuntu-2404-amd64-universe-updates-uyuni' => 240,
'ubuntu-2404-amd64-universe-uyuni' => 24_000,
'ubuntu-2404-amd64-uyuni-client-devel' => 60,
'ubuntu-24.04-pool-amd64-uyuni' => 60,
'ubuntu-2404-pool-amd64-uyuni' => 60,
'ubuntu-24.04-suse-manager-tools-amd64' => 60,
'uyuni-proxy-devel-leap-x86_64' => 60
}.freeze
Expand Down

0 comments on commit 70281a7

Please sign in to comment.