From 1087d84d41ce5e4a87b7fd85cb7ebc326b8b365c Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Wed, 7 Apr 2021 15:41:42 -0500
Subject: [PATCH] Update mariadb upload job

A previous change[0] added an ubuntu bionic Dockerfile for mariadb
but did not update the zuul file to properly tag the new image.

This change updates the zuul job in order to correctly tag the image,
as well as simplifying the ability to specify the ubuntu release.

Also updates the previous change's bionic Dockerfile to focal.

[0] https://review.opendev.org/c/openstack/openstack-helm-images/+/782843

Change-Id: I0c803bf1d2d4705b669a48bba0b9576c71d4b77d
---
 ...ockerfile.ubuntu_bionic => Dockerfile.ubuntu_focal} | 10 +++++-----
 zuul.d/mariadb.yaml                                    |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename mariadb/{Dockerfile.ubuntu_bionic => Dockerfile.ubuntu_focal} (67%)

diff --git a/mariadb/Dockerfile.ubuntu_bionic b/mariadb/Dockerfile.ubuntu_focal
similarity index 67%
rename from mariadb/Dockerfile.ubuntu_bionic
rename to mariadb/Dockerfile.ubuntu_focal
index 0b61e0fa..a72c8faa 100644
--- a/mariadb/Dockerfile.ubuntu_bionic
+++ b/mariadb/Dockerfile.ubuntu_focal
@@ -1,10 +1,10 @@
-# mariadb:10.5.3-bionic
-ARG FROM=docker.io/mariadb@sha256:bd5b3470601aa4a28132ec60a8b1c33516d09a1391864fe1dbf82a4030397fd1
+# mariadb:10.5.9-focal
+ARG FROM=docker.io/mariadb@sha256:7e244fae615587335176db07e88b43eee5e4762f35306e17c13c68125d93b9bf
 FROM ${FROM}
 
 RUN set -ex ;\
-    apt-get update ;\
-    apt-get install -y --no-install-recommends \
+    apt update ;\
+    apt install -y --no-install-recommends \
         python3-pip ;\
     pip3 --no-cache-dir install --upgrade pip ;\
     hash -r ;\
@@ -14,7 +14,7 @@ RUN set -ex ;\
       iso8601 \
       kubernetes \
       pykube-ng ;\
-    apt-get clean -y ;\
+    apt clean -y ;\
     rm -rf \
        /var/cache/debconf/* \
        /var/lib/apt/lists/* \
diff --git a/zuul.d/mariadb.yaml b/zuul.d/mariadb.yaml
index 8ee40bff..29d8e009 100644
--- a/zuul.d/mariadb.yaml
+++ b/zuul.d/mariadb.yaml
@@ -37,13 +37,14 @@
     description: Build mariadb images
     vars: &mariadb_vars
       currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
+      release: "focal"
       docker_images:
         - context: mariadb
           repository: openstackhelm/mariadb
-          dockerfile: Dockerfile.ubuntu_xenial
+          dockerfile: Dockerfile.ubuntu_{{ release }}
           tags:
-            - latest-ubuntu_xenial
-            - "ubuntu_xenial-{{ currentdate }}"
+            - "latest-ubuntu_{{ release }}"
+            - "ubuntu_{{ release }}-{{ currentdate }}"
     files: &mariadb_files
       - mariadb/.*
       - zuul.d/mariadb.yaml