From dc0cfc1b2f14f2b450bac413925c63ba93592321 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 27 Apr 2021 20:13:26 -0500
Subject: [PATCH] Update mariadb image building

This change removes the ubuntu xenial dockerfile as well as updates
the base build file to the latest image ran in focal.

Also removes the stein jobs from the zuul mariadb job list.

Change-Id: Icaf76bcf157d34e3c5365a3214dfc544eca74952
---
 mariadb/Dockerfile.ubuntu_xenial | 25 -------------------------
 mariadb/build.sh                 |  4 ++--
 zuul.d/mariadb.yaml              |  2 +-
 3 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 mariadb/Dockerfile.ubuntu_xenial

diff --git a/mariadb/Dockerfile.ubuntu_xenial b/mariadb/Dockerfile.ubuntu_xenial
deleted file mode 100644
index 18f1e6e..0000000
--- a/mariadb/Dockerfile.ubuntu_xenial
+++ /dev/null
@@ -1,25 +0,0 @@
-# mariadb:10.4.12
-ARG FROM=docker.io/mariadb@sha256:b3116f425f51353e2ba71b04647977b035c2c578d276e2d4285bd2798e8199ae
-FROM ${FROM}
-
-RUN set -ex ;\
-    apt-get update ;\
-    apt-get upgrade -y ;\
-    apt-get install -y --no-install-recommends \
-        python3-pip ;\
-    pip3 --no-cache-dir install --upgrade pip ;\
-    hash -r ;\
-    pip3 --no-cache-dir install --upgrade setuptools ;\
-    pip3 --no-cache-dir install --upgrade \
-      configparser \
-      iso8601 \
-      kubernetes \
-      pykube-ng ;\
-    apt-get clean -y ;\
-    rm -rf \
-       /var/cache/debconf/* \
-       /var/lib/apt/lists/* \
-       /var/log/* \
-       /tmp/* \
-       /var/tmp/* ;\
-    usermod -s /bin/false mysql
diff --git a/mariadb/build.sh b/mariadb/build.sh
index 9ebbfb6..1acb353 100755
--- a/mariadb/build.sh
+++ b/mariadb/build.sh
@@ -5,8 +5,8 @@ SCRIPT_DIR=`dirname ${SCRIPT}`
 cd ${SCRIPT_DIR}/..
 
 IMAGE="mariadb"
-VERSION=${VERSION:-10.5.3-bionic}
-DISTRO=${DISTRO:-ubuntu_bionic}
+VERSION=${VERSION:-10.5.9-focal}
+DISTRO=${DISTRO:-ubuntu_focal}
 REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
 EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
 docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE}
diff --git a/zuul.d/mariadb.yaml b/zuul.d/mariadb.yaml
index 29d8e00..06802e1 100644
--- a/zuul.d/mariadb.yaml
+++ b/zuul.d/mariadb.yaml
@@ -28,8 +28,8 @@
         - openstack-helm-images-upload-mariadb
         - openstack-helm-images-promote-mariadb:
             dependencies:
-              - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic
               - name: openstack-helm-images-compute-kit-train-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
 
 - job:
     name: openstack-helm-images-build-mariadb