Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ubuntu 2004 reposync issue and 2204 reposync issue #9333

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Fix ubuntu 2004 reposync issue and 2204 reposync issue #9333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
644ae35
Fix ubuntu 2004 reposync issue and 2204 reposync issue
maximenoel8 Oct 8, 2024
0998377
Fix the 2404 inconsistency.
maximenoel8 Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions testsuite/features/build_validation/reposync/srv_sync_all_products.feature
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions testsuite/features/support/constants.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
'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 22.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2204-pool-amd64-uyuni',
'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => 'ubuntu-24.04-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',
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

below (line 1646) and above (line 448) it has a dot

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK this inconsistency is real and exists. Please check spacewalk-common-channels.ini .
The Community wanted it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not speaking about the inconsistency between 2204 and 24.04.

I'm speaking about the inconsistency between ubuntu-2404-pool-amd64-uyuni and ubuntu-24.04-pool-amd64-uyuni in this file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this new name for 2404 is correct @mcalmer ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. This is the definition we have in spacewalk-commons-channel.ini

[ubuntu-2404-pool-amd64-uyuni]
label     = ubuntu-24.04-pool-amd64-uyuni
checksum  = sha256
archs     = amd64-deb
repo_type = deb
name      = Ubuntu 24.04 LTS AMD64 Base for Uyuni
gpgkey_url =
gpgkey_id =
gpgkey_fingerprint =
repo_url  = http://localhost/pub/repositories/empty-deb/?uniquekey=2404-uyuni

as you see the section name has no "dot", while the channel label which will be generated has a "dot".
So it depends what you define in your structures. Is it the channel label or the value you provide to spacewalk-common-channel command?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the value from spacewalk-common-channel for the others, in the testsuite, they have no dots.

Copy link
Contributor Author

@maximenoel8 maximenoel8 Oct 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In spacewalk-commons-channel.ini I can see 20.04, 22.04 and 24.04 have the same description.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if all 3 have no dots in spacewalk-common-channels.ini, then current modified PR is correct. Approving.

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 Down
Loading