Skip to content

MDBF-1156: Add Ubuntu 26.04 - ci_images add galera#924

Merged
grooverdan merged 3 commits intoMariaDB:devfrom
grooverdan:MDBF-1156_galera_ci_images
Mar 26, 2026
Merged

MDBF-1156: Add Ubuntu 26.04 - ci_images add galera#924
grooverdan merged 3 commits intoMariaDB:devfrom
grooverdan:MDBF-1156_galera_ci_images

Conversation

@grooverdan
Copy link
Copy Markdown
Member

With MDEV-38978 resolved, there is now mariadb-4.x galera packages for 26.04 in both dev and prod BB environments.

This adds galera to the bb-worker images.

Note the 26.04-amd64v3 image will gain an non-amd64v3 galera package for now. There currently isn't a
galera-amd64v3 builder and changes to
ci_build_images/debian.Dockerfile needs to happen to include the variant package.

Note: I did test building galera-4 using ./scripts/build -p on the amd64v3 bb worker and it built and unit tested ok.

@RazvanLiviuVarzaru
Copy link
Copy Markdown
Collaborator

RazvanLiviuVarzaru commented Mar 7, 2026

@grooverdan the CI workflow is trying to get Galera from production i.e. ci.mariadb.org
For this to happen we will have to wait to release the builders in production, re-trigger galera builds, then we can update these workflows.

If you want galera testing on the V3 builder, I can do "some tricks" to make it happen,
and have at least a 11.8 run in DEV but this PR will still have to wait for a production deployment.

@grooverdan
Copy link
Copy Markdown
Member Author

yep, a fix into the v3 builder is quite sufficient to capture any regressions.

With MDEV-38978 resolved, there is now mariadb-4.x galera packages
for 26.04 in both dev and prod BB environments.

This adds galera to the bb-worker images.

Note the 26.04-amd64v3 image will gain an non-amd64v3
galera package for now. There currently isn't a
galera-amd64v3 builder and changes to
ci_build_images/debian.Dockerfile needs to happen
to include the variant package.
@RazvanLiviuVarzaru RazvanLiviuVarzaru force-pushed the MDBF-1156_galera_ci_images branch from 62114f8 to fc8b4c6 Compare March 25, 2026 07:42
MariaDB/server@2d27301 is now 11.8

- `boost` deps should be pulled by `mk-build-deps -r -i debian/control`
-  `sid` has mariadb server 11.8
- base the other debian/ubuntu on 11.4 control file to pull boost deps for aarch64

Note: 11.4 debian/control file pulls:
- libboost-dev on all arches
- boost components only on amd64/aarch64
@RazvanLiviuVarzaru RazvanLiviuVarzaru force-pushed the MDBF-1156_galera_ci_images branch from 5c180b7 to bf853f3 Compare March 25, 2026 13:05
@RazvanLiviuVarzaru
Copy link
Copy Markdown
Collaborator

grooverdan

This comment was marked as outdated.

MariaDB/server#4863 targeting 11.4, is removing
the boost deps to support CS 6.4 so we can't base older Ubu/Deb
on 11.4, because server versions 10.6/10.11 (CS 6.4) are still built there.

Older Ubu/Deb build 11.4 + so ARM deps are still a requirement,
resulting in a small hack to the downloaded debian/control file.
@RazvanLiviuVarzaru
Copy link
Copy Markdown
Collaborator

RazvanLiviuVarzaru commented Mar 26, 2026

Update: re-run of the failed jobs worked. The mystery remains. @grooverdan hit merge if you bless this merge!

First run attempt yielded:
Debian SID ppc64le:; Ubuntu 24.04 s390x

mk-build-deps: error: syntax error in control file `debian/control' at line 2: line with unknown format (not field-colon-value)

These don't seem related to my changes, can find something similar in:
#936

Ubuntu 26.04 ppc64le
This might be related to my changes although I don't know how

./autobake-deb.sh: 1: 429:: not found
./autobake-deb.sh: 2: Syntax error: "(" unexpected

@grooverdan grooverdan merged commit c18e949 into MariaDB:dev Mar 26, 2026
26 of 31 checks passed
@grooverdan grooverdan deleted the MDBF-1156_galera_ci_images branch March 26, 2026 20:33
@grooverdan
Copy link
Copy Markdown
Member Author

Well rebuild on merged seemed to go well.

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