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.

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

Conversation

maximenoel8
Copy link
Contributor

@maximenoel8 maximenoel8 commented Oct 9, 2024

What does this PR change?

Fix ubuntu synchronization issues during BV uyuni reposync stage.

Errors

uyuni-bv-master-server:~ # mgrctl exec -i 'spacewalk-common-channels -u admin -p admin --list' | grep ubuntu-2204-pool-amd64-uyuni
 ubuntu-2204-pool-amd64-uyuni: amd64-deb

image
image

GUI diff

No difference.

  • DONE

Documentation

  • No documentation needed: only internal and user invisible changes

  • DONE

Test coverage

ℹ️ If a major new functionality is added, it is strongly recommended that tests for the new functionality are added to the Cucumber test suite

  • No tests: already covered

  • DONE

Links

Port :

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_lint_checkstyle"
  • Re-run test "java_pgsql_tests"
  • Re-run test "ruby_rubocop"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

Before you merge

Check How to branch and merge properly!

@maximenoel8 maximenoel8 requested a review from a team as a code owner October 9, 2024 00:03
Copy link
Contributor

github-actions bot commented Oct 9, 2024

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take some time (aprox. 1h), please be patient ☕
You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/9333/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/9333/checks.

If you are unsure the failing tests are related to your code, you can check the "reference jobs". These are jobs that run on a scheduled time with code from master. If they fail for the same reason as your build, it means the tests or the infrastructure are broken. If they do not fail, but yours do, it means it is related to your code.

Reference tests:

KNOWN ISSUES

Sometimes the build can fail when pulling new jar files from download.opensuse.org . This is a known limitation. Given this happens rarely, when it does, all you need to do is rerun the test. Sorry for the inconvenience.

For more tips on troubleshooting, see the troubleshooting guide.

Happy hacking!
⚠️ You should not merge if acceptance tests fail to pass. ⚠️

Copy link
Contributor

@Bischoff Bischoff left a comment

Choose a reason for hiding this comment

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

spotted inconsistency

@@ -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

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.

@maximenoel8 maximenoel8 requested a review from Bischoff October 9, 2024 08:38
Bischoff
Bischoff previously approved these changes Oct 9, 2024
Copy link
Contributor

@Bischoff Bischoff left a comment

Choose a reason for hiding this comment

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

see my comment

@@ -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.

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

@maximenoel8 maximenoel8 force-pushed the fix_ubuntu20.04_sync_issue branch from babb6a2 to 0998377 Compare October 9, 2024 08:49
@maximenoel8 maximenoel8 added the merge-candidate Meaning it needs to be considered for merging when the master branch is frozen label Oct 9, 2024
@deneb-alpha deneb-alpha merged commit 70281a7 into uyuni-project:master Oct 9, 2024
25 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build-validation-features merge-candidate Meaning it needs to be considered for merging when the master branch is frozen ruby_rubocop test-framework testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants