Skip to content

FreeBSD: build cleanup#1336

Merged
arogge merged 3 commits intobareos:masterfrom
joergsteffens:dev/joergs/master/freebsd-build
Feb 23, 2023
Merged

FreeBSD: build cleanup#1336
arogge merged 3 commits intobareos:masterfrom
joergsteffens:dev/joergs/master/freebsd-build

Conversation

@joergsteffens
Copy link
Member

@joergsteffens joergsteffens commented Dec 19, 2022 •
edited by arogge
Loading

  • fix dependencies
  • cleanup Makefile dependencies
  • set dependency for Python-3.7, as packaging currently requires this version.
  • prepare Makefiles to use custom WRKDIR

This PR separates the FreeBSD changes from #1294

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
  • Commit descriptions are understandable and well formatted
  • Check backport line
  • Is the PR title usable as CHANGELOG entry?
  • Separate commit for CHANGELOG.md ("update CHANGELOG.md"). The PR number is correct.
  • https://git.bareos.com/bareos/CD/pulls/55 merged?
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
  • bareos-check-sources --since-merge does not report any problems

@joergsteffens joergsteffens force-pushed the dev/joergs/master/freebsd-build branch from 0fac4b3 to 78be9b9 Compare December 23, 2022 18:49
@joergsteffens joergsteffens force-pushed the dev/joergs/master/freebsd-build branch from 78be9b9 to 9435af6 Compare January 16, 2023 12:54
@joergsteffens joergsteffens requested a review from arogge January 16, 2023 17:15
@joergsteffens joergsteffens marked this pull request as ready for review January 16, 2023 17:15
arogge
arogge reviewed Jan 24, 2023
View reviewed changes
arogge
arogge previously requested changes Jan 24, 2023
View reviewed changes
Copy link
Member

@arogge arogge left a comment

Choose a reason for hiding this comment

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

Looks pretty good, I'm not a fan of the edit-markers. Maybe we can consider other options here?

@joergsteffens joergsteffens force-pushed the dev/joergs/master/freebsd-build branch 2 times, most recently from d376cda to 798d9a5 Compare January 29, 2023 13:18
@joergsteffens joergsteffens requested a review from arogge January 29, 2023 15:10
@joergsteffens joergsteffens dismissed arogge’s stale review January 29, 2023 15:18

Changes applied.

arogge
arogge approved these changes Feb 13, 2023
View reviewed changes
Copy link
Member

@arogge arogge 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 we just need to have a concerted backports and merges of all this stuff.

systemtests/tests/notls/testrunner
@$out $tmp/log2.out
wait
restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done
restore client=bareos-fd where=$tmp/bareos-restores select all done
Copy link
Member

@arogge arogge Feb 13, 2023

Choose a reason for hiding this comment

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

was changing these intentional?

Copy link
Member Author

@joergsteffens joergsteffens Feb 14, 2023

Choose a reason for hiding this comment

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

Yes. It is not required to specify the fileset on restore.

@arogge arogge force-pushed the dev/joergs/master/freebsd-build branch from 072cbb7 to 6883161 Compare February 13, 2023 12:43
arogge
arogge requested changes Feb 13, 2023
View reviewed changes
Copy link
Member

@arogge arogge left a comment

Choose a reason for hiding this comment

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

We should drop the last commit (canceling build on failed test).
The behaviour on every other build is to continue and then Jenkins can (and will) decide to mark the build with the failed test as unstable.

@joergsteffens
Copy link
Member Author

joergsteffens commented Feb 14, 2023

The reason why I've changed this is that jenkins with FreeBSD test error first displays FreeBSD builds as successful and later switch it to failed. Anyhow, I can remove that commit and it will still work. It will just show temporary a wrong status and will run longer as it continues to build the other packages.

@joergsteffens joergsteffens force-pushed the dev/joergs/master/freebsd-build branch from 6883161 to 35f052e Compare February 14, 2023 12:12
@joergsteffens joergsteffens requested a review from arogge February 14, 2023 12:12
This was referenced Feb 15, 2023
Merged
Merged
Merged
joergsteffens and others added 3 commits February 23, 2023 12:48
@joergsteffens @arogge
FreeBSD: build cleanup
e391caf 
* fix dependencies
* cleanup Makefile dependencies
* set dependency for Python-3.7, as packaging currently requires this
  version.
* prepare Makefiles to use custom WRKDIR
* make sure, ctests runs as root (before, compiling has been done as
  root).
@joergsteffens @arogge
systemtest notls: cleanup
ec63c38 
No need to label volume, as autolabeling is enabled.
This prevents problems on rerun.
@arogge
Update CHANGELOG.md
7ae8a63
@arogge arogge force-pushed the dev/joergs/master/freebsd-build branch from 279eb3c to 7ae8a63 Compare February 23, 2023 11:48
@arogge arogge merged commit 0277175 into bareos:master Feb 23, 2023
@joergsteffens joergsteffens deleted the dev/joergs/master/freebsd-build branch October 11, 2023 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arogge arogge arogge approved these changes

Assignees

@arogge arogge

Labels

jenkins_repotest_nodebug requires backport to 20 requires backport to 21 requires backport to 22

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@joergsteffens @arogge