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.

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
merged 30 commits into from
Feb 7, 2025
Merged

Conversation

cvicentiu
Copy link
Member

@cvicentiu cvicentiu commented Jan 19, 2025

This is a cleanup PR that should not impact the builders / workers actually running tests.

@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch 2 times, most recently from 021d893 to 0a8eeff Compare February 5, 2025 00:02
@cvicentiu cvicentiu marked this pull request as ready for review February 5, 2025 00:03
@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch 5 times, most recently from 36ca90a to 7216b4f Compare February 5, 2025 10:42
@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch 2 times, most recently from ef361c6 to 89e8f0b Compare February 5, 2025 12:54
@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch 2 times, most recently from 6530325 to 7a9cf67 Compare February 5, 2025 14:39
@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch 2 times, most recently from 5ea16f2 to cecd7ca Compare February 5, 2025 15:45
@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch from cecd7ca to bcdef3b Compare February 6, 2025 10:24
Copy link
Collaborator

@RazvanLiviuVarzaru RazvanLiviuVarzaru left a 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]))

@cvicentiu
Copy link
Member Author

I've changed define masters to print like this:

Master 0 amd64       16 builders
Master 1 amd64       16 builders
Master 0 aarch64     14 builders
Master 0 ppc64le     8 builders
Master 0 x86         2 builders
Master 0 s390x       6 builders

@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch from c209183 to 209a041 Compare February 6, 2025 13:27
cvicentiu and others added 24 commits February 6, 2025 16:47
* 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 `,`.
@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch from aa3877a to b7ec41c Compare February 6, 2025 14:48
* 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.
@cvicentiu cvicentiu force-pushed the refactor_master_cfg branch from dff4416 to fc72186 Compare February 6, 2025 16:13
@RazvanLiviuVarzaru RazvanLiviuVarzaru merged commit f3614a0 into MariaDB:dev Feb 7, 2025
4 checks passed
@cvicentiu cvicentiu deleted the refactor_master_cfg branch February 13, 2025 05:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants