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

Jump to bottom

Master - move all package files from /srv #7651

Merged
merged 8 commits into from
Nov 20, 2023
Merged

Master - move all package files from /srv #7651

merged 8 commits into from
Nov 20, 2023

Conversation

mbussolotto
Copy link
Member

@mbussolotto mbussolotto commented Oct 6, 2023 •
edited
Loading

What does this PR change?

Use /usr/share/susemanager for all the files currently in /srv and owned by a RPM
Keep runtime, tmp and user file in /srv

Related changes :

susemanager-frontend-libs: https://build.opensuse.org/package/show/home:mbussolotto:branches:systemsmanagement:Uyuni:Master:ServerContainer/susemanager-frontend-libs
uyuni docs: https://build.opensuse.org/package/show/home:mbussolotto:branches:systemsmanagement:Uyuni:Master:ServerContainer/uyuni-docs_en
release notes: https://build.opensuse.org/package/show/home:mbussolotto:branches:systemsmanagement:Uyuni:Master:ServerContainer/release-notes-uyuni

GUI diff

No difference.

  • DONE

Documentation

Test coverage

  • No tests

  • DONE

Links

Fixes https://github.com/SUSE/spacewalk/issues/22539

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

@mbussolotto mbussolotto requested review from a team as code owners October 6, 2023 09:25
@mbussolotto mbussolotto requested review from wweellddeerr and m-czernek and removed request for a team October 6, 2023 09:25
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

Suggested tests to cover this Pull Request
  • minssh_salt_install_package
  • min_deblike_monitoring
  • srv_power_management
  • min_salt_mgrcompat_state
  • srv_sync_channels
  • proxy_cobbler_pxeboot
  • allcli_software_channels_dependencies
  • srv_content_lifecycle
  • minkvm_guests
  • srv_task_status_engine
  • srv_patches_page
  • srv_logfile
  • srv_rename_hostname
  • srv_docker_cve_audit
  • srv_enable_sync_products
  • srv_create_repository
  • srv_cobbler_profile
  • min_empty_system_profiles
  • min_ansible_control_node
  • srv_reportdb
  • min_retracted_patches
  • srv_add_rocky8_repositories
  • srv_organization_credentials
  • allcli_reboot
  • min_bootstrap_ssh_key
  • srv_manage_activationkey
  • min_deblike_salt_install_package
  • buildhost_docker_build_image
  • srv_custom_system_info
  • minssh_bootstrap_api
  • srv_advanced_search
  • srv_cobbler_distro
  • srv_scc_user_credentials
  • min_rhlike_ssh
  • allcli_update_activationkeys
  • srv_datepicker
  • min_salt_openscap_audit
  • srv_change_password
  • srv_user_preferences
  • srv_cobbler_sync
  • min_salt_install_with_staging
  • allcli_config_channel
  • min_salt_software_states
  • srv_channels_add
  • min_bootstrap_api
  • min_bootstrap_reactivation
  • min_rhlike_monitoring
  • srv_distro_cobbler
  • min_rhlike_salt_install_package_and_patch
  • min_config_state_channel_api
  • buildhost_osimage_build_image
  • srv_group_union_intersection
  • allcli_action_chain
  • min_salt_pkgset_beacon
  • buildhost_bootstrap
  • proxy_branch_network
  • srv_virtual_host_manager
  • min_cve_id_new_syntax
  • allcli_sanity
  • min_deblike_ssh
  • srv_check_channels_page
  • srv_dist_channel_mapping
  • min_config_state_channel
  • srv_change_task_schedule
  • min_salt_minions_page
  • srv_delete_channel_with_tool
  • srv_notifications
  • min_deblike_remote_command
  • sle_ssh_minion
  • srv_wait_for_reposync
  • srv_salt
  • min_custom_pkg_download_endpoint
  • allcli_software_channels
  • srv_maintenance_windows
  • sle_minion
  • srv_cobbler_buildiso
  • minssh_move_from_and_to_proxy
  • srv_users
  • srv_user_api
  • srv_push_package
  • min_docker_api
  • srv_check_sync_source_packages
  • srv_sync_products
  • allcli_system_group
  • srv_handle_config_channels_with_ISS_v2
  • srv_delete_channel_from_ui
  • srv_restart
  • srv_power_management_redfish
  • srv_user_configuration_salt_states
  • min_bootstrap_negative
  • min_activationkey
  • srv_clone_channel_npn
  • min_rhlike_salt
  • min_salt_formulas_advanced
  • srv_handle_software_channels_with_ISS_v2
  • srv_manage_channels_page
  • srv_mainpage
  • min_salt_migration
  • min_recurring_action
  • proxy_as_pod_basic_tests
  • min_salt_minion_details
  • min_salt_lock_packages
  • min_deblike_openscap_audit
  • srv_menu_filter
  • srv_check_reposync
  • min_check_patches_install
  • min_virthost
  • srv_power_management_api
  • min_move_from_and_to_proxy
  • min_project_lotus
  • min_config_state_channel_subscriptions
  • srv_payg_ssh_connection
  • min_timezone
  • min_salt_user_states
  • srv_activationkey_api
  • minssh_ansible_control_node
  • min_deblike_salt
  • srv_docker
  • buildhost_docker_auth_registry
  • srv_monitoring
  • min_deblike_salt_install_with_staging
  • min_cve_audit
  • min_rhlike_remote_command
  • srv_channel_api
  • proxy_retail_pxeboot_and_mass_import
  • min_bootstrap_script
  • min_rhlike_openscap_audit
  • srv_docker_advanced_content_management
  • srv_salt_download_endpoint
  • proxy_register_as_minion_with_script
  • min_salt_install_package
  • srv_menu
  • min_monitoring
  • min_change_software_channel
  • min_action_chain
  • srv_osimage
  • srv_first_settings
  • minssh_action_chain
  • srv_create_activationkey
  • min_salt_formulas
  • allcli_overview_systems_details
  • srv_disable_local_repos_off
  • min_ssh_tunnel

@mbussolotto mbussolotto marked this pull request as draft October 6, 2023 09:42
@mbussolotto mbussolotto force-pushed the server-container-to-master branch 3 times, most recently from d08aae5 to 914ccf7 Compare October 6, 2023 11:59
@mbussolotto mbussolotto closed this Oct 6, 2023
@mbussolotto mbussolotto reopened this Oct 6, 2023
@mbussolotto mbussolotto marked this pull request as ready for review October 6, 2023 15:30
@mbussolotto mbussolotto requested review from cbosdo, mcalmer, cbbayburt, aaannz, srbarrios and a team and removed request for m-czernek October 6, 2023 15:33
@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same 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/7651/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/7651/checks.
See the troubleshooting guide if you need any help.

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

Happy hacking!

1 similar comment
@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same 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/7651/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/7651/checks.
See the troubleshooting guide if you need any help.

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

Happy hacking!

@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same 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/7651/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/7651/checks.
See the troubleshooting guide if you need any help.

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

Happy hacking!

1 similar comment
@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same 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/7651/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/7651/checks.
See the troubleshooting guide if you need any help.

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

Happy hacking!

@mbussolotto mbussolotto marked this pull request as draft October 23, 2023 12:48
@mbussolotto mbussolotto marked this pull request as ready for review October 24, 2023 07:19
@mbussolotto mbussolotto mentioned this pull request Oct 24, 2023
Closed
1 task
@mbussolotto
change webapp folder
ae6c744 
use /usr/share/susemanager/www/ instead of /srv/www/htdocs

black magic for apache

suppportconfig extract information from shared folder

setup apache

fix salt permission

Revert changes

fix permission

fix bootstrap folder

rerite rule for pub

fix salt path

Fix broken cert link

move pub apache rule file

move empty and empty-deb repo

fix permission

fix permission

add changelog

Update spacewalk-java.spec

Update spacewalk-java.spec

Update spacewalk-java.spec

Update spacewalk-java.spec

Update susemanager.spec

Update susemanager.spec

Update susemanager.spec
@mbussolotto
move /srv/www/htdoc/pub/repositories to /usr/share/susemanager/gpg/re…
fdf0239 
…positories
@mbussolotto
adjust apache conf file
94b12b1
@mbussolotto
fix tests
3c34ff3
@mbussolotto
Update zz-spacewalk-www.conf
f582874
@mbussolotto
fix deploy in container
c037f87
@mbussolotto
Update spacewalk-setup.spec
5aa15a7
@mbussolotto
fixup! Update spacewalk-setup.spec
c373bec
@deneb-alpha
Copy link
Contributor

@mbussolotto the tests are still failing. please let me know what to do also with the SRs you prepared

@mbussolotto
Copy link
Member Author

I don't think error have something to do with the PR. @jordimassaguerpla can you please confirm it?

@mbussolotto
Copy link
Member Author

@deneb-alpha the SR should be approved as soon this PR is merged. let's see the feedback from @jordimassaguerpla

@deneb-alpha
Copy link
Contributor

Ok, let's sync for the merge, and if I'm not there, please coordinate with @raulillo82

Info: the SRs for Head can be merged too, I checked with Julio already

@jordimassaguerpla
Copy link
Contributor

you can merge, the failures are not related to this PR but to the build service not being available

@mbussolotto mbussolotto merged commit d4a360b into uyuni-project:master Nov 20, 2023
14 of 22 checks passed
@mbussolotto
Copy link
Member Author

@sbluhm Thanks for all your feedback! Consider that, besides these changes, there was also this in OBS project:

@mbussolotto
Copy link
Member Author

@sbluhm there was some error in EL9, now everything should be fine, sorry about that. Anyway, I think your assumption are right, we can get rid of all %if %else in spec file using the macro %_datadir

@sbluhm
Copy link
Contributor

sbluhm commented Nov 21, 2023

@mbussolotto , I have done some changes and a few reverts and am currently testing them on https://github.com/sbluhm/uyuni/tree/userserverdir. Let me see what you have changed.

Ideally don't change too much at the moment :)

@sbluhm
Copy link
Contributor

sbluhm commented Nov 21, 2023

FYI: Overall, I will follow your changes for EL as it simplifies a lot. So all the SUSE specific "if"s can go out.
Only thing I am keeping in are probably the "pub" folder locations on /srv or /var/www/.

@sbluhm sbluhm mentioned this pull request Nov 21, 2023
Merged
12 tasks
@jordimassaguerpla jordimassaguerpla mentioned this pull request Nov 21, 2023
Merged
1 task
@mbussolotto mbussolotto mentioned this pull request Nov 23, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbosdo cbosdo cbosdo left review comments

@mcalmer mcalmer mcalmer left review comments

@aaannz aaannz aaannz left review comments

@keichwa keichwa keichwa left review comments

@deneb-alpha deneb-alpha deneb-alpha left review comments

@rjmateus rjmateus rjmateus left review comments

@lucidd lucidd lucidd approved these changes

@mackdk mackdk mackdk approved these changes

@avshiliaev avshiliaev avshiliaev approved these changes

@jordimassaguerpla jordimassaguerpla Awaiting requested review from jordimassaguerpla

Assignees
No one assigned
Labels
API java_lint_checkstyle java_pgsql_tests java javascript_lint needs-translation old-ui ruby_rubocop susemanager_unittests test-framework testing ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.