Adapt Sid gitlab-ci.yml for MariaDB for Stretch release

debian/gitlab-ci.yml

@@ -37,8 +37,7 @@ build:
     - gbp buildpackage --git-ignore-branch --git-ignore-new --git-no-create-orig --git-overlay --git-export-dir=${WORKING_DIR} --git-builder="docker-build.sh ${SALSA_CI_IMAGES_DOCKERBUILDER}" | (head -n 5000 ; echo "==== Output supressed to avoid hitting Gitlab-CI 4 MB log limit ===="; tail -n 5000)
     - mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR}
 
-# Backports build not here as we cannot build MariaDB 10.3 backport for Stretch
-# due to unmet build dependencies.
+# Backports build not here as they are not relevant for Stretch releases.
 
 lintian:
   extends: .test-lintian
@@ -59,6 +58,7 @@ blhc:
   stage: test extras
   dependencies:
     - build
+  allow_failure: true # Hardening flags fixed only from Buster onwards
 
 # In addition to Salsa-CI, also run these fully MariaDB specific build jobs
 
@@ -152,6 +152,7 @@ mariadb-10.0 to mariadb-10.1 upgrade:
     - echo 'SHOW DATABASES;' | mysql
     # Install MariaDB built in this commit
     - sed 's/jessie/stretch/g' -i /etc/apt/sources.list # Enable next Debian release
+    - apt-get update; apt-get install -y apt # Install apt 1.4.9 so the wildcard command below works
     - apt-get install -y ./*.deb || true # Allow to proceed so debug artifacts get collected
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
@@ -231,7 +232,9 @@ build mariadbclient consumer Python-MySQLdb:
     - mkdir -p debug # Ensure dir exists before using it
     - apt-get update
     - apt-get install -y pkg-config ./libmariadbclient-dev*.deb ./libmariadbclient18_*.deb ./mariadb-common*.deb
-    - pkg-config --cflags --libs mysqlclient # See what MySQLdb builds with
+    - pkg-config --list-all # See what MySQLdb builds with
+    - ldconfig -p | grep -e mariadb -e mysql
+    - mysql_config # Must be present for mysqlclient Python module to build
     - apt-get install -y python3-pip
     - pip3 install mysqlclient # Compiles module against libmysqlclient
     - apt-get purge -y libmariadb-dev # Not needed for run-time