Skip to content

Conversation

@RazvanLiviuVarzaru
Copy link
Collaborator

@RazvanLiviuVarzaru RazvanLiviuVarzaru commented May 19, 2025

  • docker library - needs bump 10.6 to jammy in docker gh project
  • remove release ub2004 builders (os-info)
  • bump ubuntu to 22.04 for integration testing builders: eco-php removed, needs re-work
  • bump ubuntu to 22.04 for special builders:
    • debug (all arches) - remove amd64 2004 builder from protected branches before prod deploy
    • big-test (amd64)
    • full - test (amd64)
    • without server (ppc) - Solved in 6b29365

10.5 is no longer supported, start SUPPORTED_PLATFORMS from 10.6 - Solved in #765

Copy link
Member

@grooverdan grooverdan 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. Guess we'll see who the eco-php goes.

Could remove 10.5 out of the gridview.

maps to what I was planning on the Docker Official Images side - MariaDB/mariadb-docker#553

@grooverdan
Copy link
Member

MariaDB/mariadb-docker#645 for merging at the same time as the CI starts triggering the docker-library worker from jammy.

@RazvanLiviuVarzaru
Copy link
Collaborator Author

MariaDB/mariadb-docker#645 for merging at the same time as the CI starts triggering the docker-library worker from jammy.

So when this patch reaches buildbot production, right?

@grooverdan
Copy link
Member

MariaDB/mariadb-docker#645 for merging at the same time as the CI starts triggering the docker-library worker from jammy.

So when this patch reaches buildbot production, right?

yes. BB production.

@grooverdan
Copy link
Member

MariaDB/mariadb-docker#645 for merging at the same time as the CI starts triggering the docker-library worker from jammy.

So when this patch reaches buildbot production, right?

yes. BB production.

No need to rush the on the MariaDB/mariadb-docker#645 merge. It will only impact 10.6 pushes which don't happen too often. @fauust and @vl-radu have push rights there when needed (and actually all server developers - which I may reconsider at some stage soon).

RazvanLiviuVarzaru added a commit to RazvanLiviuVarzaru/buildbot-r that referenced this pull request Jun 12, 2025
This patch is targeted for buildbot release v1.0.7
I know I had an attempt to cover it in
MariaDB#756

but I don't like getting merge conflicts on constants.py.
so it's better to separate the concerns a bit,
remove 10.5 and then handle any platform deprecation / addition.
RazvanLiviuVarzaru added a commit to RazvanLiviuVarzaru/buildbot-r that referenced this pull request Jun 12, 2025
This patch is targeted for buildbot release v1.0.7
I know I had an attempt to cover it in MariaDB#756

but I don't like getting merge conflicts on constants.py.
so it's better to separate the concerns a bit,
remove 10.5 and then handle any platform deprecation / addition.
RazvanLiviuVarzaru added a commit to RazvanLiviuVarzaru/buildbot-r that referenced this pull request Jun 12, 2025
This patch is targeted for buildbot release v1.0.7
I know I had an attempt to cover it in MariaDB#756

but I don't like getting merge conflicts on constants.py.
so it's better to separate the concerns a bit,
remove 10.5 and then handle any platform deprecation / addition.
RazvanLiviuVarzaru added a commit to RazvanLiviuVarzaru/buildbot-r that referenced this pull request Jun 12, 2025
This patch is targeted for buildbot release v1.0.7
I know I had an attempt to cover it in MariaDB#756

but I don't like getting merge conflicts on constants.py.
so it's better to separate the concerns a bit,
remove 10.5 and then handle any platform deprecation / addition.
RazvanLiviuVarzaru added a commit to RazvanLiviuVarzaru/buildbot-r that referenced this pull request Jun 13, 2025
This patch is targeted for buildbot release v1.0.7
I know I had an attempt to cover it in MariaDB#756

but I don't like getting merge conflicts on constants.py.
so it's better to separate the concerns a bit,
remove 10.5 and then handle any platform deprecation / addition.
RazvanLiviuVarzaru added a commit that referenced this pull request Jun 13, 2025
This patch is targeted for buildbot release v1.0.7
I know I had an attempt to cover it in #756

but I don't like getting merge conflicts on constants.py.
so it's better to separate the concerns a bit,
remove 10.5 and then handle any platform deprecation / addition.
@RazvanLiviuVarzaru RazvanLiviuVarzaru changed the title draft - remove 10.5 support and remove eol ub2004 MDBF-1078 Ubuntu 20.04 is EOL Jun 26, 2025
@RazvanLiviuVarzaru RazvanLiviuVarzaru marked this pull request as ready for review June 26, 2025 10:10
@RazvanLiviuVarzaru
Copy link
Collaborator Author

RazvanLiviuVarzaru commented Jun 26, 2025

@grooverdan this patch is ready for your final review.
Please have a look at c468a36
I thought upgrading PHP builder container image would be less time consuming but I was wrong!

How to test c468a36

docker run -it --rm quay.io/rvarzaru/test:php_ubuntu_2204 bash
sh -xc 'curl https://raw.githubusercontent.com/MariaDB/buildbot/main/dockerfiles/ecofiles/installdb.sh -o /buildbot/installdb.sh && chmod a+x /buildbot/installdb.sh
sh -xc 'curl https://raw.githubusercontent.com/MariaDB/buildbot/main/dockerfiles/ecofiles/test-php.sh -o /buildbot/test-php.sh && chmod a+x /buildbot/test-php.sh'
/buildbot/installdb.sh https://ci.mariadb.org/57746/amd64-ubuntu-2204/mariadb-11.8.3-linux-x86_64.tar.gz --plugin-load-add=auth_pam --pam_use_cleartext_plugin
mkdir /code
mkdir /build
sh -xc '/buildbot/test-php.sh PHP-8.1'

Note: maybe you know better why is this happening:
when building 8.1 -> 8.2 -> 8.3 (OK)
and when I try to build the master branch I need to ./buildconf --force because the configure script is no longer present.
Should I add ./buildconf --force in the test script for every test?

@grooverdan
Copy link
Member

you could [ ! -f configure ] && ./buildconf --force

Alternately I had a play with using compose to make run tests against released php which might be sufficient - grooverdan@ce2b326#diff-bbcfeb8a42b67e1105356482e81736e01cddecce7e3fe6bf13bd9f1fa02ad15c

happy to move the latest php branch build with MariaDB to a new project ( running in PHP's github actions?) if you want to package the compose /pod test runs like wordpress and just use released versions. Test exclusions have got a bit out of date.

The early PHP version is based on https://mariadb.org/post-mortem-php-and-mariadb-docker-issue/ and with the container the php-7.1 can still work.

@RazvanLiviuVarzaru
Copy link
Collaborator Author

RazvanLiviuVarzaru commented Jun 27, 2025

you could [ ! -f configure ] && ./buildconf --force

Alternately I had a play with using compose to make run tests against released php which might be sufficient - grooverdan@ce2b326#diff-bbcfeb8a42b67e1105356482e81736e01cddecce7e3fe6bf13bd9f1fa02ad15c

happy to move the latest php branch build with MariaDB to a new project ( running in PHP's github actions?) if you want to package the compose /pod test runs like wordpress and just use released versions. Test exclusions have got a bit out of date.

The early PHP version is based on https://mariadb.org/post-mortem-php-and-mariadb-docker-issue/ and with the container the php-7.1 can still work.

I see PHP folks use Circle CI to perform integration tests with MySQL / PostgreSQL.
Sample Run from a Pull Request check

A possible course of action can be:

  • remove the PHP builder from buildbot
  • contribute mariadb to PHP CI

I don't know if this approach is any better.
This will shift the way bug reports flow, from PHP -> mariadb. Comes with the advantage that every PHP commit is tested against a released mariadb version. Also they keep their test suite include/exclude lists up to date I suppose (need to check)
The big disadvantage is that if we break some functionality in relation to PHP, we will only know it after we release and PHP folks most probably will wait for the next release for the test case/s to be fixed.

What do you say?

@RazvanLiviuVarzaru
Copy link
Collaborator Author

RazvanLiviuVarzaru commented Jun 27, 2025

sh -xc '/buildbot/test-php.sh PHP-8.1'

Additionally, the PHP builder is triggered by the ubuntu2004 builder,
So removing 2004 is forcing me to upgrade the container image.

About PHP 7.1. -> I get the same as in php/php-src#11810
One solution would be to build an older bison (not recommended) or:
-> discard 7.x series from testing
-> remove the builder altogether

php 7.4, last in the 7.x series, is EOL since 2022. I think it's time to discard the 7.x series?

@grooverdan
Copy link
Member

happy to remove the php builder altogether and rework it in to external CI in some form.

@RazvanLiviuVarzaru
Copy link
Collaborator Author

happy to remove the php builder altogether and rework it in to external CI in some form.

Perfect!

1. Remove the release builders
2. Docker Library - 10.6 on 2204
3. Upgrade dependent builders:
    - Bump Ubuntu to 22.04 for integration testing builders: `eco-php`
    - Bump Ubuntu to 22.04 for special builders: debug, big-test, full-test

Make sure to remove amd64-ubuntu-2004-debug from branch protection and add 2204 instead.
- fixed runtime deps for mariadb in ubuntu 22.04 container
- fixed build-time deps for php in 22.04 container

PHP 7.1 won't compile on 22.04 container but it's EOL anyway.
- updated the list with only supported versions. See: https://www.php.net/supported-versions
@RazvanLiviuVarzaru RazvanLiviuVarzaru merged commit e11c18c into MariaDB:dev Jul 3, 2025
24 of 29 checks passed
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