Skip to content

contrib: add packaging for the contrib subproject#768

Merged
joergsteffens merged 25 commits intomasterfrom
dev/joergs/master/contrib-build
Apr 7, 2022
Merged

contrib: add packaging for the contrib subproject#768
joergsteffens merged 25 commits intomasterfrom
dev/joergs/master/contrib-build

Conversation

@joergsteffens
Copy link
Member

@joergsteffens joergsteffens commented Mar 23, 2021

Add packages
* bareos-contrib-director-python-plugins.install
* bareos-contrib-filedaemon-python-plugins.install
* bareos-contrib-tools

Renamed triggerjob to bareos-triggerjob to indicate, that it belongs to Bareos.

Removed support for RHEL4 from SPEC file. It is no longer used.

OP#4820

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

General
  • PR name is meaningful
  • Purpose of the PR is understood
  • Separate commit for this PR in the CHANGELOG.md, PR number referenced is same
  • Commit descriptions are understandable and well formatted
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
  • check-sources --since-merge does not report any problems
  • git status should not report modifications in the source tree after building and testing
Tests
  • Decision taken that a system- or unittest is required (if not, then remove this paragraph)
  • The decision towards a systemtest is reasonable compared to a unittest
  • Testname matches exactly what is being tested
  • Output of the test leads quickly to the origin of the fault

joergsteffens added a commit that referenced this pull request Mar 23, 2021
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from 18ab6c8 to 919e8e0 Compare March 23, 2021 14:25
joergsteffens added a commit that referenced this pull request Mar 23, 2021
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch 2 times, most recently from 00b44ea to 60db5fb Compare March 26, 2021 16:53
@robertoschwald
Copy link
Contributor

Hope this work is finished asap and leads to packages in https://download.bareos.org/bareos/contrib/.
The current contrib repo packages do not support Bareos 20, so I need to manually overwrite the mysql python files.

@joergsteffens
Copy link
Member Author

This PR depends on improving the Bareos Python packaging, which is handled as separate task. As soon, as this is fixed, work on this PR can continue.

joergsteffens added a commit that referenced this pull request Dec 22, 2021
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from 60db5fb to c52128b Compare December 22, 2021 18:36
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from c52128b to 146c929 Compare December 22, 2021 18:59
joergsteffens added a commit that referenced this pull request Dec 23, 2021
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from 372debb to 35bf863 Compare December 23, 2021 09:00
joergsteffens added a commit that referenced this pull request Dec 23, 2021
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from 35bf863 to d6eaf10 Compare December 23, 2021 11:08
joergsteffens added a commit that referenced this pull request Dec 23, 2021
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from d6eaf10 to ae478e9 Compare December 23, 2021 12:44
joergsteffens added a commit that referenced this pull request Feb 4, 2022
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from aa25377 to eff7d71 Compare February 4, 2022 17:53
joergsteffens added a commit that referenced this pull request Feb 4, 2022
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from eff7d71 to f0f410b Compare February 4, 2022 19:23
joergsteffens added a commit that referenced this pull request Feb 9, 2022
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from 705f5ad to f4005fe Compare February 9, 2022 17:42
joergsteffens added a commit that referenced this pull request Feb 9, 2022
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch 3 times, most recently from 58da2d6 to d20fda8 Compare February 10, 2022 15:45
@joergsteffens joergsteffens marked this pull request as ready for review February 10, 2022 17:58
@joergsteffens joergsteffens requested a review from sduehr February 10, 2022 17:59
joergsteffens added a commit that referenced this pull request Apr 6, 2022
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from de3661d to e08eefd Compare April 6, 2022 12:34
@joergsteffens joergsteffens requested a review from sduehr April 6, 2022 17:38
joergsteffens added a commit that referenced this pull request Apr 6, 2022
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from 589bd26 to b773da7 Compare April 6, 2022 18:21
@joergsteffens
Copy link
Member Author

Additionally, in docs/manuals/source/Appendix/Howtos/BackupOfThirdPartyDatabases.rst.inc please replace _mysqlbackups_ by @mysqlbackup@

Done.

Renamed bareos-tasks-plugins to bareos_tasks.
Adapt file names to PEP8 (lowercase, no - in names).
Adapt bareos_tasks.pssql to Bareos >= 20.
... and adapted it to Python 3.

Uses sudo instead of subprocess preexec_fn function,
which is not supported in subprocessors in Python 3.
Added option defaultsfile.
Renamend option mysql_user to user, as the system user is meant, not the database user.
Cover the case of empty databases.
Added the contrib/fd-plugins path to PYTHONPATH,
in order to test the Python modules by systemtests.
Add test for the contrib bareos_mysql_dump python module.
Adds Python 2 und 3 tests for the contrib bareos_tasks.mysql plugin.
Currently 4 systemtests do start/stop a MySQL/MariaDB daemon to perform their testing.
This commits unifies the required functions.

MariaDBs are treated as MySQL databases. Unfortenatly, initialisation differs.
With this change, initialisation works with both databases.
@joergsteffens joergsteffens force-pushed the dev/joergs/master/contrib-build branch from b773da7 to dbbdd5a Compare April 6, 2022 20:26
Copy link
Member

@sduehr sduehr left a comment

Choose a reason for hiding this comment

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

Looks good now, thanks a lot!

@joergsteffens joergsteffens merged commit 0e7a3cd into master Apr 7, 2022
pstorz pushed a commit to arogge/bareos that referenced this pull request Apr 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants