Deb: Sync downstream changes upstream

- Reduce Build-Depends https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/150bf990c6059a2fca95ea9bc4d108c9789b179d Dependencies chrpath, dh-apparmor and libarchive-dev are not needed. Fixes buildbot sid failures that error on: Unmet build dependencies: chrpath dh-apparmor libarchive-dev - Salsa-CI: Remove mysql-5.7 upgrade in Sid test as package was removed https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/6f55ac620ce26046475b2a430838367732b47d54 Also clean away extra Salsa-CI markup not needed anymore. - Autopkgtest: Simplify autopkgtest 'smoke' to be easier to debug https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/836907989ad8d355b2f88f8013a6acb8a64cf7d9 - Autopkgtest: Skip main.failed_auth_unixsocket on armhf and i386 https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/74601f8b31a6c59e825089c52a1ca21545062813

Deb: Sync downstream changes upstream
- Reduce Build-Depends https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/150bf990c6059a2fca95ea9bc4d108c9789b179d Dependencies chrpath, dh-apparmor and libarchive-dev are not needed. Fixes buildbot sid failures that error on: Unmet build dependencies: chrpath dh-apparmor libarchive-dev - Salsa-CI: Remove mysql-5.7 upgrade in Sid test as package was removed https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/6f55ac620ce26046475b2a430838367732b47d54 Also clean away extra Salsa-CI markup not needed anymore. - Autopkgtest: Simplify autopkgtest 'smoke' to be easier to debug https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/836907989ad8d355b2f88f8013a6acb8a64cf7d9 - Autopkgtest: Skip main.failed_auth_unixsocket on armhf and i386 https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/74601f8b31a6c59e825089c52a1ca21545062813
bba6c386 · Otto Kekäläinen · baddbaa0 · bba6c386 · bba6c386 · bba6c386
Commit bba6c386 authored Mar 09, 2021 by Otto Kekäläinen
Showing with 32 additions and 40 deletions

debian/control debian/control +2 -5

debian/salsa-ci.yml debian/salsa-ci.yml +1 -28

debian/tests/smoke debian/tests/smoke +23 -5

debian/tests/upstream debian/tests/upstream +6 -2

No files found.
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,14 @@ Section: database
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 Build-Depends: bison,
-               chrpath,
               cmake,
-               cracklib-runtime,
+               cracklib-runtime <!nocheck>,
               debhelper (>= 9),
-               dh-apparmor,
               dh-exec,
               dh-systemd,
               flex [amd64],
-               gdb,
+               gdb <!nocheck>,
               libaio-dev [linux-any],
-               libarchive-dev,
               libboost-atomic-dev [amd64],
               libboost-chrono-dev [amd64],
               libboost-date-time-dev [amd64],

--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -292,7 +292,7 @@ mariadb-10.1 Stretch to mariadb-10.5 upgrade:
    # Install almost everything currently in Debian Stretch,
    # omitting libmariadbclient-dev-compat as it would conflict
    - apt-get install -y 'default-mysql*' 'mariadb-*' 'libmariadbd*' 'libmariadbclient*'
-    # Verify installation of MariaDB from Buster
+    # Verify installation of MariaDB from Stretch
    - *test-verify-initial
    - *test-enable-sid-repos
    - *test-install
@@ -562,31 +562,6 @@ mysql-8.0 Sid to mariadb-10.5 upgrade:
  # Installation often fails (not a MariaDB reason), so do not require this test to pass
  allow_failure: true

-mysql-5.7 Sid to mariadb-10.5 upgrade:
-  stage: upgrade in Sid
-  needs:
-    - job: build
-      artifacts: true
-  image: debian:sid
-  artifacts:
-    when: always
-    name: "$CI_BUILD_NAME"
-    paths:
-      - ${WORKING_DIR}/debug
-  script:
-    - *test-prepare-container
-    - apt-get install -y mysql-server-5.7 'libmysqlc*'
-    - *test-verify-initial
-    - *test-install
-    - service mysql status
-    - sleep 5 # Give the mysql_upgrade a bit of time to complete before querying the server
-    - *test-verify-final
-  variables:
-    GIT_STRATEGY: none
-  except:
-    variables:
-      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|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.
 mysql-8.0 Focal to mariadb-10.5 upgrade:
@@ -622,8 +597,6 @@ mysql-8.0 Focal to mariadb-10.5 upgrade:
  except:
    variables:
      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  # Installation often fails (not a MariaDB reason), so do not require this test to pass
-  allow_failure: true

 mysql-5.7 Bionic to mariadb-10.5 upgrade:
  stage: upgrade extras

--- a/debian/tests/smoke
+++ b/debian/tests/smoke
@@ -24,7 +24,7 @@
 echo "Running test 'smoke'"
 set -ex

-# Start the deamon if it was not running. For example in Docker testing
+# Start the daemon if it was not running. For example in Docker testing
 # environments there might not be any systemd et al and the service needs to
 # be started manually.
 if ! which systemctl
@@ -66,16 +66,24 @@ DROP DATABASE testdatabase;
 DROP USER 'testuser'@'localhost';
 EOT

-mysql <<EOT
+# List based on what is advertised at
+# https://mariadb.com/kb/en/innodb-page-compression/#configuring-the-innodb-page-compression-algorithm
+# but disabled  with '#' the options that are not available in this binary build
+mariadb <<EOT
 SET GLOBAL innodb_compression_algorithm=lz4;
+#SET GLOBAL innodb_compression_algorithm=lzo;
+#SET GLOBAL innodb_compression_algorithm=lzma;
+#SET GLOBAL innodb_compression_algorithm=bzip2;
+#SET GLOBAL innodb_compression_algorithm=snappy;
 SET GLOBAL innodb_compression_algorithm=zlib;
 SET GLOBAL innodb_compression_algorithm=none;
 EOT

-# Check whether RocksDB should be installed or not.
+# Check whether RocksDB should be installed or not
 plugin=mariadb-plugin-rocksdb
 if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] &&
-   [ "$(dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)" = little ]; then
+   [ "$(dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)" = little ]
+  then
  dpkg-query -W $plugin

  LOG=/var/lib/mysql/#rocksdb/LOG
@@ -83,8 +91,18 @@ if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] &&
  #      mariadb-server-10.5, which happens before that of the plugin.
  [ -e $LOG ] || mysql -e "INSTALL PLUGIN RocksDB SONAME 'ha_rocksdb';"
  # XXX: rocksdb_supported_compression_types variable does not report ZSTD.
+
+  # Print RocksDB supported items so test log is easier to debug
+  grep -F " supported:" $LOG
+
+  # Check that the expected compression methods are supported
  for a in LZ4 Snappy Zlib ZSTD; do
-    grep -qE "k$a(Compression)? supported: 1" $LOG
+    if ! grep -qE "k$a(Compression)? supported: 1" $LOG
+    then
+      # Fail with explicit error message
+      echo "Error: Compression method $a not supported by RocksDB!" >&2
+      exit 1
+    fi
  done
 else
  ! dpkg-query -W $plugin

--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -50,8 +50,12 @@ EOF
 fi

 ARCH=$(dpkg --print-architecture)
-if [ "$ARCH" = "s390x" ]; then
-    echo "main.func_regexp_pcre : recursion fails on s390x https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1723947" >> $SKIP_TEST_LST
+if [ "$ARCH" = "s390x" ]
+then
+  echo "main.func_regexp_pcre : recursion fails on s390x https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1723947" >> $SKIP_TEST_LST
+elif [ "$ARCH" = "armhf" ] || [ "$ARCH" = "i386" ]
+then
+  echo "main.failed_auth_unixsocket : Test returns wrong exit code on armhf and i386 (but only in debci) https://jira.mariadb.org/browse/MDEV-23933" >> $SKIP_TEST_LST
 fi

 cd /usr/share/mysql/mysql-test