Skip to content

uniformized variables#2391

Merged
BareosBot merged 17 commits intobareos:masterfrom
bruno-at-bareos:uniformized-variables
Oct 30, 2025
Merged

uniformized variables#2391
BareosBot merged 17 commits intobareos:masterfrom
bruno-at-bareos:uniformized-variables

Conversation

@bruno-at-bareos
Copy link
Contributor

@bruno-at-bareos bruno-at-bareos commented Oct 13, 2025

This PR aims to bring uniformization in variables used in core and tests scripts.

  • scripts: move ctl- from core to systemtests* fix move bareos-ctl-* scripts to systemtest directory #2383
  • scripts: uniformize to BAREOS_SCRIPTS_DIR
  • scripts: uniformize to BAREOS_CONFIG_DIR
  • scripts: remove user/group from ctl- in systemtests*
  • subsysdir: remove unused variable in all scripts and packaging

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)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
    Required backport PRs have been created
  • Correct milestone is set
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
Tests
  • Decision taken that a test is required (if not, then remove this paragraph)
  • The choice of the type of test (unit test or systemtest) is reasonable
  • Testname matches exactly what is being tested
  • On a fail, output of the test leads quickly to the origin of the fault

@bruno-at-bareos bruno-at-bareos self-assigned this Oct 15, 2025
@bruno-at-bareos bruno-at-bareos marked this pull request as ready for review October 16, 2025 07:49
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

I still have to try to understand some changes but here are already some comments.

@bruno-at-bareos bruno-at-bareos added this to the 25.0.0 milestone Oct 20, 2025
@arogge arogge dismissed sebsura’s stale review October 27, 2025 10:23

@sebsura told me to dismiss it

@bruno-at-bareos bruno-at-bareos force-pushed the uniformized-variables branch 2 times, most recently from b1fcc4a to fd401ef Compare October 28, 2025 13:58
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Great work. Just a few simple things left to do.

@bruno-at-bareos bruno-at-bareos force-pushed the uniformized-variables branch 2 times, most recently from daa379d to 3b70adf Compare October 30, 2025 09:58
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Thanks for the awesome work! Its so much better now

bruno-at-bareos and others added 12 commits October 30, 2025 15:33
- remove shipping in rpm packages
- adapt sourcing for tests
- use BareosSystemtestFunctions.cmake for bareos-ctl-* configuration
- add copyright/license when missing
- set surrounding bracket around var when missing
- when needed use explicit local_conf variable instead previous
  global conf
- fix indentation
systemtests doesn't need nor use specific user/group
This mainly revert b2735de
- enable copy-remote-bscan systemtests
- setup temporaly configuration with new variable

Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
- avoid relative path ../ in variable
- use variable name which are not command
bruno-at-bareos and others added 6 commits October 30, 2025 15:33
The only consumer of this script is systemtests, so we move it there.
functions is revisited to use `bin/bareos`

Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
@BareosBot BareosBot force-pushed the uniformized-variables branch from 2a418a9 to 7689c17 Compare October 30, 2025 15:33
@BareosBot BareosBot merged commit ba37367 into bareos:master Oct 30, 2025
@bruno-at-bareos bruno-at-bareos deleted the uniformized-variables branch November 26, 2025 09:08
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.

move bareos-ctl-* scripts to systemtest directory

4 participants