Merge 10.5 into 10.6

1 files changed, 4 insertions, 23 deletions

diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 1a62bb2b52b..f62358a1e48 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -33,7 +33,8 @@ build:
     - export CCACHE_DIR="${CCACHE_TMP_DIR}"
     - update-ccache-symlinks; ccache -z # Zero out ccache counters
     - mk-build-deps debian/control -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -r -i
-    - debian/autobake-deb.sh
+    - while true; do sleep 600; echo "10 minutes passed" >&2; done & # Progress keeper since build is long and silent
+    - debian/autobake-deb.sh |& tail -n 10000 # Keep Gitlab-CI output under 4 MB
     - cd ..; rm -rfv *.tmp # Clean away build files not to store as artifacts
     - cp -v *.* ${WORKING_DIR}/
     - du -shc ${WORKING_DIR}/* # Show total file size of artifacts. Must stay are under 100 MB.
@@ -72,7 +73,6 @@ autopkgtest:
 piuparts:
   extends: .test-piuparts
   stage: test extras
-  allow_failure: true
 
 blhc:
   extends: .test-blhc
@@ -83,11 +83,9 @@ blhc:
 
 lintian:
   extends: .test-lintian
-  allow_failure: true
 
 missing-breaks:
   extends: .test-missing-breaks
-  allow_failure: true
 
 # In addition to Salsa-CI, also run these fully MariaDB specific build jobs
 
@@ -123,7 +121,6 @@ fresh install:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-10.3.x to mariadb-10.6.y upgrade:
   stage: upgrade in Sid
@@ -164,7 +161,6 @@ mariadb-10.3.x to mariadb-10.6.y upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-10.3.x buster to mariadb-10.6 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -209,7 +205,6 @@ mariadb-10.3.x buster to mariadb-10.6 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-10.1 to mariadb-10.6 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -254,7 +249,6 @@ mariadb-10.1 to mariadb-10.6 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 test basic features:
   stage: test
@@ -310,7 +304,6 @@ test basic features:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 # Build a piece of software that was designed for libmysqlclient-dev but using the
 # libmariadb-dev-compat layer. Should always end up using libmariadb.so.3 run-time.
@@ -334,7 +327,6 @@ build mariadbclient consumer Python-MySQLdb:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 libmysql* to libmariadb* upgrade:
   stage: test extras
@@ -374,7 +366,6 @@ libmysql* to libmariadb* upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 default-libmysqlclient-dev upgrade:
   stage: upgrade in Sid
@@ -401,7 +392,6 @@ default-libmysqlclient-dev upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 default-libmysqlclient-dev on buster upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -430,7 +420,6 @@ default-libmysqlclient-dev on buster upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 default-libmysqlclient-dev on stretch upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -459,7 +448,6 @@ default-libmysqlclient-dev on stretch upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-connector-c on stretch upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -488,7 +476,6 @@ mariadb-connector-c on stretch upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mysql-5.5 to mariadb-10.6 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -533,7 +520,6 @@ mysql-5.5 to mariadb-10.6 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 # Upgrading from MySQL 5.7 involves automatic renaming of auth_socket plugin
 # to unix_socket and automaticly re-adding Password column in user table.
@@ -580,7 +566,6 @@ mysql-5.7 to mariadb-10.6 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 # Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump.
 # The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh.
@@ -647,17 +632,14 @@ mariadb.org-10.5.x to mariadb-10.6 upgrade:
     - sed -i "s/101/0/g" -i /usr/sbin/policy-rc.d # Enable automatic restarts from maint scripts
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - apt-get update
-    - apt install -y curl systemctl # systemctl shim needed on platforms that don't have systemd
+    - apt install -y curl
     - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo 'deb [arch=amd64,i386] http://mirror.one.com/mariadb/repo/10.5/debian sid main' > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
     - apt-get install -y mariadb-server-10.5
     # Verify installation of MySQL from Sid
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
-    # MariaDB.org version of 10.4 and early 10.5 do not install an init file, so
-    # it must be installed here manually
-    - cp /usr/share/mysql/mysql.init /etc/init.d/mysql; chmod +x /etc/init.d/mysql; service mysql start; sleep 5
-    - service mysql status
+    - service mariadb status
     - mysql --skip-column-names -e "SELECT @@version, @@version_comment"
     - mysql -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
     - mysql -e "SELECT * FROM plugin;" mysql
@@ -667,7 +649,6 @@ mariadb.org-10.5.x to mariadb-10.6 upgrade:
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql status
     - service mariadb status
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"