From 95d71272eff7d7f0faf64e7afe2cef5b8578b562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 11 Nov 2022 14:21:56 -0800 Subject: [PATCH] Gitlab-CI: Upgrade Fedora build always use latest (now 37) version The version was fixed to be Fedora 36 due to previous issues on Gitlab-CI, but those seem to be solved now. Use 'mariadb' name in scripts and server binary as Fedora switched name in https://src.fedoraproject.org/rpms/mariadb/c/df76620f9e8a9b3f14da8a615050feeac2c62e26 Switch to using the `default:` section supported by newer Gitlab-CI, see https://docs.gitlab.com/ee/ci/yaml/#default. Also define an explicit timeout of 3 hours to ensure builds don't time out if the default timeout is too short. NOTE TO MERGERS: These changes are version independent and should be merged up on all MariaDB branches 10.6 -> 10.11. --- .gitlab-ci.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06a6feef8c3..56f11c2917d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,9 +28,12 @@ stages: - test - Salsa-CI -# Base image for builds and tests unless otherwise defined -# @TODO: Fedora 34 is latest, but fails to start on Gitlab.com with error "shell not found" -image: fedora:33 +default: + # Base image for builds and tests unless otherwise defined + image: fedora:latest + # Extend build jobs to have longer timeout as the default GitLab + # timeout (1h) is often not enough + timeout: 3h # Define common CMAKE_FLAGS for all builds. Skim down build by omitting all # submodules (a commit in this repo does not affect their builds anyway) and @@ -427,14 +430,14 @@ fedora upgrade: dependencies: - fedora script: - - yum install -y mariadb-server + - dnf install -y mariadb-server # Fedora does not support running services in Docker (like Debian packages do) so start it manually - - /usr/libexec/mysql-check-socket - - /usr/libexec/mysql-prepare-db-dir - - sudo -u mysql /usr/libexec/mysqld --basedir=/usr & sleep 10 + - /usr/libexec/mariadb-check-socket + - /usr/libexec/mariadb-prepare-db-dir + - sudo -u mysql /usr/libexec/mariadbd --basedir=/usr & sleep 10 # Dump database contents in installed state - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > old-installed-database.sql - - /usr/libexec/mysql-check-upgrade + - /usr/libexec/mariadb-check-upgrade # Dump database contents in upgraded state - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > old-upgraded-database.sql - mariadb --skip-column-names -e "SELECT @@version, @@version_comment" # Show version