Use Ubuntu releases in Gitlab-CI where possible

debian/gitlab-ci.yml

@@ -9,8 +9,8 @@ variables:
 stages:
   - build on Stretch (like Bionic)
   - test quality
-  - upgrade in Stretch (like Bionic)
-  - upgrade from Jessie (like Xenial)
+  - upgrade in Bionic
+  - upgrade from Xenial
 
 build package:
   stage: build on Stretch (like Bionic)
@@ -56,7 +56,7 @@ run lintian:
 
 fresh install:
   stage: test quality
-  image: debian:${RELEASE}
+  image: ubuntu:bionic
   artifacts:
     when: always
     name: "$CI_BUILD_NAME"
@@ -86,7 +86,7 @@ test basic features:
   stage: test quality
   dependencies:
     - build package
-  image: debian:${RELEASE}
+  image: ubuntu:bionic
   artifacts:
     when: always
     name: "$CI_BUILD_NAME"
@@ -155,7 +155,7 @@ build mariadbclient consumer Python-MySQLdb:
   stage: test quality
   dependencies:
     - build package
-  image: debian:${RELEASE}
+  image: ubuntu:bionic
   script:
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - mkdir -p debug # Ensure dir exists before using it
@@ -172,10 +172,10 @@ build mariadbclient consumer Python-MySQLdb:
       GIT_STRATEGY: none
 
 mariadb-10.1.x to mariadb-10.1.y upgrade:
-  stage: upgrade in Stretch (like Bionic)
+  stage: upgrade in Bionic
   dependencies:
     - build package
-  image: debian:stretch
+  image: ubuntu:bionic
   artifacts:
     when: always
     name: "$CI_BUILD_NAME"
@@ -185,9 +185,9 @@ mariadb-10.1.x to mariadb-10.1.y 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
-    # Install almost everything currently in Debian Stretch
-    - apt-get install -y 'default-mysql*' 'mariadb-*' 'libmariadbd*' 'libmariadbclient*'
-    # Verify installation of MariaDB currently in Debian Stretch
+    # Install almost everything currently in Ubuntu Bionic
+    - apt-get install -y 'mariadb-*' 'libmariadbd*' 'libmariadbclient*'
+    # Verify installation of MariaDB currently in Ubuntu Bionic
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - service mysql status
     - mariadb --skip-column-names -e "select @@version, @@version_comment"
@@ -209,10 +209,10 @@ mariadb-10.1.x to mariadb-10.1.y upgrade:
       GIT_STRATEGY: none
 
 mariadb-10.0 to mariadb-10.1 upgrade:
-  stage: upgrade from Jessie (like Xenial)
+  stage: upgrade from Xenial
   dependencies:
     - build package
-  image: debian:jessie
+  image: ubuntu:xenial
   artifacts:
     when: always
     name: "$CI_BUILD_NAME"
@@ -222,15 +222,15 @@ mariadb-10.0 to mariadb-10.1 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
-    # Install almost everything currently in Debian Jessie
+    # Install almost everything currently in Ubuntu Xenial
     - apt-get install -y 'mariadb-*' 'libmariadb*'
-    # Verify installation of MariaDB from Jessie
+    # Verify installation of MariaDB from Xenail
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - service mysql status
     - mysql --skip-column-names -e "select @@version, @@version_comment"
     - echo 'SHOW DATABASES;' | mysql
     # Install MariaDB built in this commit
-    - sed 's/jessie/stretch/g' -i /etc/apt/sources.list # Enable next Debian release
+    - sed 's/xenial/bionic/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
@@ -248,10 +248,10 @@ mariadb-10.0 to mariadb-10.1 upgrade:
       GIT_STRATEGY: none
 
 mysql-5.5 to mariadb-10.1 upgrade:
-  stage: upgrade from Jessie (like Xenial)
+  stage: upgrade from Xenial
   dependencies:
     - build package
-  image: debian:jessie
+  image: ubuntu:xenial
   artifacts:
     when: always
     name: "$CI_BUILD_NAME"
@@ -262,13 +262,13 @@ mysql-5.5 to mariadb-10.1 upgrade:
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - apt-get update
     - apt-get install -y mysql-server
-    # Verify installation of MySQL from Jessie
+    # Verify installation of MySQL from Xenial
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - service mysql status
     - mysql --skip-column-names -e "select @@version, @@version_comment"
     - echo 'SHOW DATABASES;' | mysql
     # Install MariaDB built in this commit
-    - sed 's/jessie/stretch/g' -i /etc/apt/sources.list # Enable next Debian release
+    - sed 's/xenial/bionic/g' -i /etc/apt/sources.list # Enable next Ubuntu 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