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

strip bootstrap repos and remove EOL OSes #8793

Merged
merged 2 commits into from
Dec 10, 2024

Conversation

mcalmer
Copy link
Contributor

@mcalmer mcalmer commented May 22, 2024

What does this PR change?

  • strip bootstrap repos to contain only venv-salt-minion and dependencies
  • remove OS definitions which do not have the salt bundle

GUI diff

No difference.

  • DONE

Documentation

  • TBD

  • DONE

Test coverage

  • No tests: already covered

  • DONE

Links

Issue: https://github.com/SUSE/spacewalk/issues/19896

  • 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_pgsql_tests"
  • 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!

@mcalmer mcalmer force-pushed the shrink-bootstrap-repos branch from 80bea8d to df84123 Compare May 23, 2024 08:07
@mcalmer mcalmer marked this pull request as ready for review May 23, 2024 08:19
@mcalmer mcalmer requested review from a team and m-czernek and removed request for a team May 23, 2024 08:20
@srbarrios
Copy link
Member

srbarrios commented May 24, 2024

It looks something to be well tested before merging.
If you have the opportunity to run this in a uyuni-pr test pipeline, that would be great, it will not cover all the products like in BV... but at least we will cover one.

@admd
Copy link
Contributor

admd commented Jul 23, 2024

@deneb-alpha @m-czernek can you please take a look here tomorrow.

m-czernek
m-czernek previously approved these changes Jul 25, 2024
Copy link
Contributor

@m-czernek m-czernek left a comment

Choose a reason for hiding this comment

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

From my POV, this is OK, though I'm unable to verify all package changes, e.g. not sure why we're keeping gnupg on Debian but not on Ubuntu. I can see that we require it in https://build.opensuse.org/projects/systemsmanagement:saltstack:bundle:next/packages/venv-salt-minion/files/venv-salt-minion.spec?expand=1; I assume that's because of old versions on the debian systems?

susemanager/susemanager.changes.mc.shrink-bootstrap-repos Outdated Show resolved Hide resolved
@mcalmer
Copy link
Contributor Author

mcalmer commented Oct 23, 2024

From my POV, this is OK, though I'm unable to verify all package changes, e.g. not sure why we're keeping gnupg on Debian but not on Ubuntu. I can see that we require it in https://build.opensuse.org/projects/systemsmanagement:saltstack:bundle:next/packages/venv-salt-minion/files/venv-salt-minion.spec?expand=1; I assume that's because of old versions on the debian systems?

Debian does not have it installed by default. Don't ask me why.

@mcalmer mcalmer force-pushed the shrink-bootstrap-repos branch from a0426cd to 615f079 Compare October 23, 2024 07:16
@mcalmer
Copy link
Contributor Author

mcalmer commented Oct 23, 2024

It looks something to be well tested before merging. If you have the opportunity to run this in a uyuni-pr test pipeline, that would be great, it will not cover all the products like in BV... but at least we will cover one.

That pipeline is currently not due to containers

m-czernek
m-czernek previously approved these changes Oct 23, 2024
Copy link
Contributor

@m-czernek m-czernek left a comment

Choose a reason for hiding this comment

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

Ok, understood. +1 from my side.

Copy link
Contributor

@deneb-alpha deneb-alpha left a comment

Choose a reason for hiding this comment

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

Leaving a summary here because on some parts of the file I wasn't able to properly drop a suggestion.

  • Debian 9 to 10 are EOL already, Debian 11 is currently in our grace period too
  • Ubuntu 18.04 is EOL too. We only submit from 20.04 on
  • For SLE, 15 SP0 and SP1 should be already EOL
  • On the SLE 12 side, I admit I don't know if there are special contracts going on, but to my knowledge, everything older than 12-SP5 excluded could be finally dropped
  • for SLES4SAP 11 SP4, I think there's still some support going on
  • not sure if we want to drop older SUMA versions too. I think in the list I saw some 4.0 entries too
  • Leap 15.4 is EOL too and 15.5 will be EOL end of 2024.
  • on some package lists I suggested to harmonize how we write the list of packages. From what I saw on past reviews, the way I suggested usually creates a better diff when we drop or add more packages, but of course, feel free to ignore the suggestion if you think it's not a good idea.

susemanager/src/mgr_bootstrap_data.py Show resolved Hide resolved
susemanager/src/mgr_bootstrap_data.py Outdated Show resolved Hide resolved
susemanager/src/mgr_bootstrap_data.py Show resolved Hide resolved
susemanager/src/mgr_bootstrap_data.py Show resolved Hide resolved
susemanager/src/mgr_bootstrap_data.py Outdated Show resolved Hide resolved
"venv-salt-minion",
"python3-gnupg",
"python3-looseversion",
"python3-jmespath",
]

PKGLISTDEBIAN11 = [
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 what to do here. Debian 11 is in our grace period before EOL.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Then let's keep it for now

"DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
},
"SLES4SAP-15-SP1-ppc64le": {
"PDID": [1770, 1710, 1765],
"BETAPDID": [1926],
"PKGLIST": ONLYSLE15 + PKGLIST15_SALT + PKGLIST15_PPC,
"PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
"DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
},
Copy link
Contributor

Choose a reason for hiding this comment

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

do we still need 15 SP0 and SP1? to my knowledge, they should be gone

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Miguel said that as long as "SLES 15" is supported we should keep all SPs.
That's also the reason why we still have all SLES12 SPs in our list

"BASECHANNEL": "opensuse_leap15_3-aarch64",
"PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
"DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/3/bootstrap/",
},
"openSUSE-Leap-15.4-x86_64": {
Copy link
Contributor

Choose a reason for hiding this comment

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

Leap 15.4 is gone too for one year now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not sure if it was still used in one of our testsuites.

susemanager/src/mgr_bootstrap_data.py Outdated Show resolved Hide resolved
susemanager/src/mgr_bootstrap_data.py Outdated Show resolved Hide resolved
@mcalmer mcalmer force-pushed the shrink-bootstrap-repos branch from 10c93a8 to ea3683a Compare December 8, 2024 13:39
@mcalmer
Copy link
Contributor Author

mcalmer commented Dec 10, 2024

I will merge this now

@mcalmer mcalmer merged commit d1b3bd5 into uyuni-project:master Dec 10, 2024
22 checks passed
@mcalmer mcalmer deleted the shrink-bootstrap-repos branch December 10, 2024 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants