Merge "Drop support for building MariaDB clustercheck"

15 files changed, 21 insertions, 101 deletions

diff --git a/docker/mariadb/mariadb-server/Dockerfile.j2 b/docker/mariadb-server/Dockerfile.j2
index 15b9e48a4..ddb045fbb 100644
--- a/docker/mariadb/mariadb-server/Dockerfile.j2
+++ b/docker/mariadb-server/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
@@ -18,6 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% set mariadb_packages = [
         'expect',
+        'mariadb',
         'mariadb-backup',
         'mariadb-server',
         'mariadb-server-galera',
@@ -34,12 +35,19 @@ RUN ln -s /usr/lib64/galera-4 /usr/lib64/galera
     {% set mariadb_packages = [
         'expect',
         'mariadb-backup',
+        'mariadb-client',
         'mariadb-server'
     ] %}
 {% endif %}
 
 {{ macros.install_packages(mariadb_packages | customizable("packages")) }}
 
+{% block mariadb_healthcheck %}
+ENV MARIADB_VERSION=10.11
+ADD plugins-archive /
+RUN install -m 755 /plugins/mariadb-server-plugin-mariadb-docker-archive*/$MARIADB_VERSION/healthcheck.sh /usr/bin/healthcheck.sh
+{% endblock %}
+
 COPY mariadb_sudoers /etc/sudoers.d/kolla_mariadb_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 COPY security_reset.expect /usr/local/bin/kolla_security_reset
diff --git a/docker/mariadb/mariadb-server/backup.sh b/docker/mariadb-server/backup.sh
index be63cd938..be63cd938 100644
--- a/docker/mariadb/mariadb-server/backup.sh
+++ b/docker/mariadb-server/backup.sh
diff --git a/docker/mariadb/mariadb-server/backup_replica.sh b/docker/mariadb-server/backup_replica.sh
index ebdcbf6b0..ebdcbf6b0 100644
--- a/docker/mariadb/mariadb-server/backup_replica.sh
+++ b/docker/mariadb-server/backup_replica.sh
diff --git a/docker/mariadb/mariadb-server/extend_start.sh b/docker/mariadb-server/extend_start.sh
index 53a54557d..53a54557d 100644
--- a/docker/mariadb/mariadb-server/extend_start.sh
+++ b/docker/mariadb-server/extend_start.sh
diff --git a/docker/mariadb/mariadb-server/healthcheck_mariadb b/docker/mariadb-server/healthcheck_mariadb
index 0d9f59a95..0d9f59a95 100755
--- a/docker/mariadb/mariadb-server/healthcheck_mariadb
+++ b/docker/mariadb-server/healthcheck_mariadb
diff --git a/docker/mariadb/mariadb-server/mariadb_sudoers b/docker/mariadb-server/mariadb_sudoers
index 150534e16..150534e16 100644
--- a/docker/mariadb/mariadb-server/mariadb_sudoers
+++ b/docker/mariadb-server/mariadb_sudoers
diff --git a/docker/mariadb/mariadb-server/security_reset.expect b/docker/mariadb-server/security_reset.expect
index 06f1d5c8e..06f1d5c8e 100644
--- a/docker/mariadb/mariadb-server/security_reset.expect
+++ b/docker/mariadb-server/security_reset.expect
diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2
deleted file mode 100644
index 51cdadb29..000000000
--- a/docker/mariadb/mariadb-base/Dockerfile.j2
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block mariadb_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='mysql') }}
-
-{# NOTE(mnasiadka): Using AppStream packages on CS10 for now #}
-{% if base_package_type == 'rpm' %}
-    {% set mariadb_base_packages = [
-        'mariadb',
-    ] %}
-
-{% elif base_package_type == 'deb' %}
-{{ macros.enable_extra_repos(['mariadb']) }}
-    {% set mariadb_base_packages = [
-        'mariadb-client',
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(mariadb_base_packages | customizable("packages")) }}
-
-{# NOTE(mnasiadka): Latest clustercheck version as of May 2023 is 10.9 #}
-{% block mariadb_clustercheck_version %}
-ARG mariadb_clustercheck_version=10.9
-ARG mariadb_clustercheck_url=https://src.fedoraproject.org/rpms/mariadb/raw/${mariadb_clustercheck_version}/f/clustercheck.sh
-{% endblock %}
-
-RUN curl -o /usr/bin/clustercheck ${mariadb_clustercheck_url} \
-    && chmod 755 /usr/bin/clustercheck
-
-{% block mariadb_healthcheck %}
-ENV MARIADB_VERSION=10.11
-ADD plugins-archive /
-RUN install -m 755 /plugins/mariadb-base-plugin-mariadb-docker-archive*/$MARIADB_VERSION/healthcheck.sh /usr/bin/healthcheck.sh
-{% endblock %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block mariadb_base_footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
deleted file mode 100644
index 7aee4ef05..000000000
--- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block mariadb_clustercheck_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-COPY socat_wrapper.sh /usr/local/bin/socat_wrapper
-
-RUN chmod 644 /usr/local/bin/kolla_extend_start && \
-    chmod 755 /usr/local/bin/socat_wrapper
-
-{{ macros.kolla_patch_sources() }}
-
-{% block mariadb_clustercheck_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-clustercheck/extend_start.sh b/docker/mariadb/mariadb-clustercheck/extend_start.sh
deleted file mode 100644
index 7379abddc..000000000
--- a/docker/mariadb/mariadb-clustercheck/extend_start.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-: ${MARIADB_LOG_DIR:=/var/log/kolla/mariadb}
-
-# Create log directory, with appropriate permissions
-if [[ ! -d "${MARIADB_LOG_DIR}" ]]; then
-    mkdir -p ${MARIADB_LOG_DIR}
-fi
-if [[ $(stat -c %a ${MARIADB_LOG_DIR}) != "755" ]]; then
-    chmod 755 ${MARIADB_LOG_DIR}
-fi
diff --git a/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh b/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh
deleted file mode 100644
index bf562e3d5..000000000
--- a/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-catch_term() {
-    kill -TERM "$child" 2>/dev/null
-    exit 0
-}
-
-catch_quit() {
-    kill -QUIT "$child" 2>/dev/null
-    exit 0
-}
-
-trap catch_term SIGTERM
-trap catch_quit SIGQUIT
-
-socat "$@" &
-
-child=$!
-wait "$child"
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index ea8df7c57..70ff33ea7 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -193,7 +193,7 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/manila/'
                      'manila-${openstack_branch}.tar.gz')},
-    'mariadb-base-plugin-mariadb-docker': {
+    'mariadb-server-plugin-mariadb-docker': {
         # NOTE(seunghun1ee): This repo is needed to get MariaDB healthcheck.sh
         'type': 'git',
         'reference': 'master',
diff --git a/releasenotes/notes/remove-mariadb-clustercheck-427a6cfb3f39c508.yaml b/releasenotes/notes/remove-mariadb-clustercheck-427a6cfb3f39c508.yaml
new file mode 100644
index 000000000..2a6fcadba
--- /dev/null
+++ b/releasenotes/notes/remove-mariadb-clustercheck-427a6cfb3f39c508.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Dropped support for building MariaDB clustercheck container image as it
+    will not be compatible with MariaDB 11.4 (the next LTS version).
diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml
index 1a56c81ff..93578439a 100644
--- a/zuul.d/scenarios/cephadm.yaml
+++ b/zuul.d/scenarios/cephadm.yaml
@@ -6,10 +6,10 @@
     check:
       jobs:
         - kolla-ansible-debian-bookworm-cephadm:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+            files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
         - kolla-ansible-debian-bookworm-cephadm-upgrade:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+            files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
         - kolla-ansible-ubuntu-noble-cephadm:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+            files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
         - kolla-ansible-ubuntu-noble-cephadm-upgrade:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+            files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml
index 42b4535df..3627e11a4 100644
--- a/zuul.d/scenarios/mariadb.yaml
+++ b/zuul.d/scenarios/mariadb.yaml
@@ -6,6 +6,6 @@
     check:
       jobs:
         - kolla-ansible-debian-bookworm-mariadb:
-            files: ^docker/(base|mariadb)/
+            files: ^docker/(base|mariadb-server)/
         - kolla-ansible-ubuntu-noble-mariadb:
-            files: ^docker/(base|mariadb)/
+            files: ^docker/(base|mariadb-server)/