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

Bump version to 5.1.0 and clean the spec files #9221

Merged
merged 1 commit into from
Sep 2, 2024

Conversation

deneb-alpha
Copy link
Contributor

@deneb-alpha deneb-alpha commented Aug 27, 2024

What does this PR change?

  • Bump version to 5.1.0 and clean the spec files with spec-cleaner
  • Move to RELEASE_STAGE=beta for setting the proper labels on the containers
  • Update the rhn_web.conf to web.version = 5.1.0 Alpha1
  • Update the rhn_web.conf to web.version.uyuni = 2024.09
  • Update INIT_BASE in the Dockerfiles from opensuse/leap:15.5 to opensuse/leap:15.6
  • Update BASE in Dockerfiles from bci-base:15.5 to bci-base:15.6
  • Add migration paths from 5.0 to 5.1
  • Please note that containers/proxy-systemd-services/uyuni-proxy-systemd-services has been also bumped, but it should directly be dropped for 5.1 and Uyuni 2024.09. See also https://github.com/SUSE/spacewalk/issues/23356 I didn't do directly here because this PR is quite huge already and it could make sense to drop this package in a new PR.

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

Links

relates: https://github.com/SUSE/spacewalk/issues/25152

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

Copy link
Contributor

👋 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/9221/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/9221/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
Member

@juliogonzalez juliogonzalez left a comment

Choose a reason for hiding this comment

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

Looks to be OK in general. Left some comments.

Since the PR is huge, could be I missed something, but we should be able to detect it when we try to build all the stuff.

@mcalmer
Copy link
Contributor

mcalmer commented Aug 29, 2024

@deneb-alpha not in this PR, but we should not forget to change the ProjectConfig of D:G:M:H

Macros:
%_default_namespace registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.1
%_default_helm_registry registry.suse.de/devel/galaxy/manager/head/charts/suse/manager/5.1

Etheryte
Etheryte previously approved these changes Aug 29, 2024
Copy link
Member

@Etheryte Etheryte left a comment

Choose a reason for hiding this comment

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

Nothing to review from frontend.

@deneb-alpha
Copy link
Contributor Author

@deneb-alpha not in this PR, but we should not forget to change the ProjectConfig of D:G:M:H

Macros: %_default_namespace registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.1 %_default_helm_registry registry.suse.de/devel/galaxy/manager/head/charts/suse/manager/5.1

yes, as soon as the PR will be ready to be merged I'll have to adapt both Head and Uyuni:Master

mcalmer
mcalmer previously approved these changes Aug 29, 2024
cbbayburt
cbbayburt previously approved these changes Aug 29, 2024
susemanager-utils/mgr-libmod/mgr-libmod.spec Outdated Show resolved Hide resolved
- Move to RELEASE_STAGE=beta for setting the proper labels on the containers
- Update the rhn_web.conf to web.version = 5.1.0 Alpha1
- Update the rhn_web.conf to web.version.uyuni = 2024.09
- Update INIT_BASE in the Dockerfiles from opensuse/leap:15.5 to opensuse/leap:15.6
- Update BASE in Dockerfiles from bci-base:15.5 to bci-base:15.6
- Add migration paths from 5.0 to 5.1
Copy link
Member

@juliogonzalez juliogonzalez left a comment

Choose a reason for hiding this comment

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

As the PR is huge, I only reviewed again the missing schema migrations, not the whole PR again.

Looks good.

Copy link
Member

@rjmateus rjmateus left a comment

Choose a reason for hiding this comment

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

just one small nitpick

@raulillo82
Copy link
Contributor

raulillo82 commented Sep 2, 2024

In order not to trust the script blindly, even after so many reviews, I've run this command, from Marina's fork (see end of the message).

No rests of 5.0.X, which is a good sign. Continuing review.

raul@mordor:~/Documentos/gh-repos/git-repos-initial-clone/spacewalk_initial_clone/spacewalk ((996b22c91a1...) $)$ find . -name "*.spec" -exec echo {} \; -exec grep ^Version {} \;
./branding/spacewalk-branding.spec
Version:        5.1.0
./java/spacewalk-java.spec
Version:        5.1.0
./projects/perl-Satcon/perl-Satcon.spec
Version:        5.1.0
./projects/ssl-cert-check/spacewalk-ssl-cert-check.spec
Version:        5.1.0
./proxy/installer/spacewalk-proxy-installer.spec
Version:        5.1.0
./proxy/proxy-docs/spacewalk-proxy-docs.spec
Version:        5.1.0
./proxy/proxy-html/spacewalk-proxy-html.spec
Version:        5.1.0
./proxy/proxy/spacewalk-proxy.spec
Version:        5.1.0
./reporting/spacewalk-reports.spec
Version:        5.1.0
./schema/spacewalk/susemanager-schema.spec
Version:        5.1.0
./schema/reportdb/uyuni-reportdb-schema.spec
Version:        5.1.0
./search-server/spacewalk-search/spacewalk-search.spec
Version:        5.1.0
./selinux/jabberd-selinux/jabberd-selinux.spec
Version:        2.8.2
./selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
Version:        11.2.0.4
./selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
Version:         10.2.0.27
./selinux/oracle-selinux/oracle-selinux.spec
Version:         0.1.23.42
./selinux/oracle-xe-selinux/oracle-xe-selinux.spec
Version:         10.2.0.47
./selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
Version:        2.8.3
./selinux/spacewalk-selinux/spacewalk-selinux.spec
Version:        2.8.6
./spacecmd/spacecmd.spec
Version:        5.1.0
./spacewalk/admin/spacewalk-admin.spec
Version:        5.1.0
./spacewalk/certs-tools/spacewalk-certs-tools.spec
Version:        5.1.0
./spacewalk/config/spacewalk-config.spec
Version:        5.1.0
./spacewalk/package/spacewalk.spec
Version:        5.1.0
Version for PostgreSQL database backend.
./spacewalk/setup/spacewalk-setup.spec
Version:        5.1.0
./spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
Version:        5.1.0
./spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.spec
Version:        5.1.0
./utils/spacewalk-utils.spec
Version:        5.1.0
./web/spacewalk-web.spec
Version:        5.1.0
./client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec
Version:        5.1.0
./client/tools/mgr-push/mgr-push.spec
Version:        5.1.0
./susemanager-branding-oss/susemanager-branding-oss.spec
Version:        5.1.0
./susemanager-sync-data/susemanager-sync-data.spec
Version:        5.1.0
./susemanager-utils/mgr-libmod/mgr-libmod.spec
Version:        5.1.0
./susemanager-utils/supportutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.spec
Version:        5.1.0
./susemanager-utils/supportutils-plugin-susemanager-proxy/supportutils-plugin-susemanager-proxy.spec
Version:        5.1.0
./susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.spec
Version:        5.1.0
./susemanager-utils/susemanager-sls/susemanager-sls.spec
Version:        5.1.0
./susemanager/susemanager.spec
Version:        5.1.0
./tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec
Version:        5.1.0
./tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec
Version:        5.1.0
./uyuni/base/uyuni-base.spec
Version:        5.1.0
./uyuni/uyuni-payg-timer/uyuni-payg-timer.spec
Version:        5.1.0
./uyuni/uyuni-storage-setup/uyuni-storage-setup.spec
Version:        5.1.0
./containers/proxy-systemd-services/uyuni-proxy-systemd-services.spec
Version:        5.1.0
./python/billingdataservice/billing-data-service.spec
Version:        5.1.0
./python/rhn/rhnlib.spec
Version:        5.1.0
./python/spacewalk/spacewalk-backend.spec
Version:        5.1.0
./python/uyuni/uyuni-common-libs.spec
Version:        5.1.0
./microservices/coco-attestation/uyuni-coco-attestation.spec
Version:        5.1.0
./microservices/uyuni-java-common/uyuni-java-common.spec
Version:        5.1.0
./microservices/uyuni-java-parent/uyuni-java-parent.spec
Version:        5.1.0

@raulillo82
Copy link
Contributor

This PR is huge to review, I've added checkboxes in the description for each item before approving. A tick means a review from me.

@raulillo82
Copy link
Contributor

BASE changed to 15.6 everywhere for the dockerfiles:

raul@mordor:~/Documentos/gh-repos/git-repos-initial-clone/spacewalk_initial_clone/spacewalk ((996b22c91a1...) $)$ find . -name "Dockerfile" -exec echo {} \; -exec grep BASE= {} \;
./testsuite/features/profiles/Docker/Dockerfile
./testsuite/features/profiles/Docker/authprofile/Dockerfile
./testsuite/features/profiles/Docker/serverhost/Dockerfile
./testsuite/features/profiles/cloud_aws/Docker/Dockerfile
./testsuite/features/profiles/cloud_aws/Docker/authprofile/Dockerfile
./testsuite/features/profiles/cloud_aws/Docker/serverhost/Dockerfile
./testsuite/features/profiles/internal_nue/Docker/Dockerfile
./testsuite/features/profiles/internal_nue/Docker/authprofile/Dockerfile
./testsuite/features/profiles/internal_nue/Docker/serverhost/Dockerfile
./testsuite/features/profiles/internal_prv/Docker/Dockerfile
./testsuite/features/profiles/internal_prv/Docker/authprofile/Dockerfile
./testsuite/features/profiles/internal_prv/Docker/serverhost/Dockerfile
./testsuite/dockerfiles/controller-dev/Dockerfile
./testsuite/dockerfiles/opensuse-minion/Dockerfile
./testsuite/dockerfiles/rocky-minion/Dockerfile
./testsuite/dockerfiles/server-all-in-one-dev/Dockerfile
./testsuite/dockerfiles/ubuntu-minion/Dockerfile
./containers/proxy-httpd-image/Dockerfile
ARG BASE=registry.suse.com/bci/bci-base:15.6
ARG BASE=registry.suse.com/bci/bci-base:15.6
./containers/proxy-salt-broker-image/Dockerfile
ARG BASE=registry.suse.com/bci/bci-base:15.6
ARG BASE=registry.suse.com/bci/bci-base:15.6
./containers/proxy-squid-image/Dockerfile
ARG BASE=registry.suse.com/bci/bci-base:15.6
ARG BASE=registry.suse.com/bci/bci-base:15.6
./containers/proxy-ssh-image/Dockerfile
ARG BASE=registry.suse.com/bci/bci-base:15.6
ARG BASE=registry.suse.com/bci/bci-base:15.6
./containers/proxy-tftpd-image/Dockerfile
ARG BASE=registry.suse.com/bci/bci-base:15.6
ARG BASE=registry.suse.com/bci/bci-base:15.6
./containers/init-image/Dockerfile
ARG INIT_BASE=opensuse/leap:15.6
./containers/server-attestation-image/Dockerfile
ARG BASE=registry.suse.com/bci/bci-base:15.6
./containers/server-hub-xmlrpc-api-image/Dockerfile
ARG BASE=registry.suse.com/bci/bci-base:15.6
./containers/server-image/Dockerfile
./containers/server-migration-14-16-image/Dockerfile
./python/linting/Dockerfile
./.devcontainer/dev/Dockerfile
./.devcontainer/test/Dockerfile

Copy link
Contributor

@raulillo82 raulillo82 left a comment

Choose a reason for hiding this comment

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

LGTM, approving (see my last comments for details).

@deneb-alpha deneb-alpha merged commit 37d5572 into uyuni-project:master Sep 2, 2024
40 checks passed
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.

8 participants