-
Notifications
You must be signed in to change notification settings - Fork 26
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
Refactor master cfg #686
Merged
RazvanLiviuVarzaru
merged 30 commits into
MariaDB:dev
from
cvicentiu:refactor_master_cfg
Feb 7, 2025
Merged
Refactor master cfg #686
RazvanLiviuVarzaru
merged 30 commits into
MariaDB:dev
from
cvicentiu:refactor_master_cfg
Feb 7, 2025
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
021d893
to
0a8eeff
Compare
36ca90a
to
7216b4f
Compare
ef361c6
to
89e8f0b
Compare
6530325
to
7a9cf67
Compare
5ea16f2
to
cecd7ca
Compare
cecd7ca
to
bcdef3b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @cvicentiu
There are still diff's related to Tags, I will send you a tarball.
Please fix define_masters.py
so it reports the correct number of builders per arch
amd64 1
aarch64 1
ppc64le 1
x86 1
s390x 1
You need [arch]
print(arch, len(master_config["builders"][arch]))
I've changed define masters to print like this:
|
c209183
to
209a041
Compare
* Also fixup unescaped backslashes in strings
* Also simplify branch matching functions
This is a larger commit that does the following: 1. os_info now specifically mentions the image_tag to use for the OS. 2. os_info specifies tags per os. 3. define_masters now reads os_info and groups by arch. 4. Make autogen buildbot.tac allow relative import 5. buildbot.tac no longer a "template" with log name filled in by master name, but a file that gets copied for each master. 6. Validate master updated to change the way each master should be started.
Instead only cd to base srcdir. This will allow all relative imports to work accordingly.
Autogen buildbot.tac sets the basedir as two folders up, while other buildbot.tac files set basedir as one folder up. All the files are the same otherwise. * Small side effect, make maxRotatedFiles set to 30 across the board.
No need to modify them in the master.cfg, just define them correctly in os_info.yaml
* autobake tag gets added to autobake builders during master.cfg
No logic changes, just reorder the code to make it shorter.
* Typo in ppc64le * Use tags from master-config.yml, not from OS_INFO. * Have define_masters add tags to master-config.yml
Accidental tuple was created because of a stray `,`.
aa3877a
to
b7ec41c
Compare
* No longer run buildbot upgrade-master. The script is not compatible with our deployment format. * Fix paths in start-bbm-web.sh * www port must be an int.
dff4416
to
fc72186
Compare
RazvanLiviuVarzaru
approved these changes
Feb 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a cleanup PR that should not impact the builders / workers actually running tests.