diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2021-03-11 22:04:22 +0200 |
|---|---|---|
| committer | Otto Kekäläinen <otto@kekalainen.net> | 2021-03-29 07:29:03 -0700 |
| commit | 0df74a0197a5c2acf50645516fbf6bf20ad7e27f (patch) | |
| tree | f6cea14d804abed39f5766284c03989a0bd28480 /debian/salsa-ci.yml | |
| parent | 5a4daa909953f02e83b29dfe25bd9c8b25fe04fc (diff) | |
| download | mariadb-git-0df74a0197a5c2acf50645516fbf6bf20ad7e27f.tar.gz | |
Deb: Fix failing Salsa-CI by syncing fixes from downstream to upstream
Fixes jobs:
- mysql-8.0 Sid to mariadb-10.5 upgrade
- mariadb.org-10.5 to mariadb-10.5 upgrade
Downstream source:
https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/8db0e530872fea258e87533349fa83568eeed02d
Diffstat (limited to 'debian/salsa-ci.yml')
| -rw-r--r-- | debian/salsa-ci.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 07ad7c1af42..579d43aac66 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -541,9 +541,8 @@ mysql-8.0 Sid to mariadb-10.5 upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - # First install often fail due to bug in mysql-8.0 - - apt-get install -y mysql-server 'libmysqlc*' || true - - sleep 10 && apt-get install -f + # The postinst fails often if 'ps' is missing from system, so install procps + - apt-get install -y procps mysql-server 'libmysqlc*' - *test-verify-initial - *test-install - service mysql status @@ -647,8 +646,13 @@ mariadb.org-10.5 to mariadb-10.5 upgrade: - echo 'deb http://mirror.one.com/mariadb/repo/10.5/debian sid main' > /etc/apt/sources.list.d/mariadb.list - apt-get update - *test-install-readline-in-sid-for-backwards-compat + # The 10.5.9 relase is missing mariadb-plugin-columnstore, define all other packages but it to avoid hitting the error: + # The following packages have unmet dependencies: + # mariadb-plugin-columnstore : Depends: mariadb-server-10.5 (= 1:10.5.8+maria~sid) but 1:10.5.9+maria~sid is to be installed + - apt-get install -y libmariadb3 'libmariadb-*' 'libmariadbd*' 'mariadb-c*' 'mariadb-b*' 'mariadb-s*' 'mariadb-t*' 'mariadb-plugin-con*' 'mariadb-plugin-cr*' 'mariadb-plugin-g*' 'mariadb-plugin-m*' 'mariadb-plugin-o*' 'mariadb-plugin-s*' + # Once 10.5.10 is out, revert back to: # Package libmariadbclient-dev from mariadb.org conficts with libmariadb-dev in Sid, so cannot use wildcard that would include it - - apt-get install -y 'mariadb*' libmariadb3 'libmariadb-*' 'libmariadbd*' + #- apt-get install -y 'mariadb*' libmariadb3 'libmariadb-*' 'libmariadbd*' - *test-verify-initial # Install MariaDB built in this commit # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.5.5-1 vs 1:10.5.5+mariadb~sid |