From 0cb4378923cfd862525b12cc86db87e7917a55e3 Mon Sep 17 00:00:00 2001 From: Daniel Black <daniel@mariadb.org> Date: Thu, 15 Aug 2024 14:07:49 +1000 Subject: [PATCH] Manually hack release status/support status As API unnormalized. --- 11.5-ubi/Dockerfile | 2 +- 11.5/Dockerfile | 2 +- 11.6-ubi/Dockerfile | 4 ++-- 11.6/Dockerfile | 4 ++-- update.sh | 14 ++++++++++++++ versions.json | 30 +++++++++++++++++++++++++++++- 6 files changed, 49 insertions(+), 7 deletions(-) diff --git a/11.5-ubi/Dockerfile b/11.5-ubi/Dockerfile index 9641cb6..6dbc85c 100644 --- a/11.5-ubi/Dockerfile +++ b/11.5-ubi/Dockerfile @@ -56,7 +56,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=11.5.1 ENV MARIADB_VERSION=$MARIADB_VERSION -# release-status:RC +# release-status:Stable # release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) diff --git a/11.5/Dockerfile b/11.5/Dockerfile index 3607177..6a04d06 100644 --- a/11.5/Dockerfile +++ b/11.5/Dockerfile @@ -81,7 +81,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=1:11.5.1+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION -# release-status:RC +# release-status:Stable # release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) diff --git a/11.6-ubi/Dockerfile b/11.6-ubi/Dockerfile index 46e67ba..a059b83 100644 --- a/11.6-ubi/Dockerfile +++ b/11.6-ubi/Dockerfile @@ -56,8 +56,8 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=11.6.0 ENV MARIADB_VERSION=$MARIADB_VERSION -# release-status:Unknown -# release-support-type:Unknown +# release-status:RC +# release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # missing pwgen(epel), jemalloc(epel) (as entrypoint/user extensions) diff --git a/11.6/Dockerfile b/11.6/Dockerfile index 06bf0e3..e3f5b28 100644 --- a/11.6/Dockerfile +++ b/11.6/Dockerfile @@ -81,8 +81,8 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=1:11.6.0+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION -# release-status:Alpha -# release-support-type:Unknown +# release-status:RC +# release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions diff --git a/update.sh b/update.sh index 4055f78..7467700 100755 --- a/update.sh +++ b/update.sh @@ -246,6 +246,20 @@ for version in "${versions[@]}"; do | jq -r --arg version "${version%-*}" '.major_releases[] | select(.release_id == $version) | [ .release_status ] , [ .release_support_type ] | @tsv')" releaseStatus=${release[0]:-Unknown} supportType=${release[1]:-Unknown} + if [ "$releaseStatus" == Unknown ]; then + case "$version" in + 11.5*) + releaseStatus=Stable + ;; + 11.6*) + releaseStatus=RC + ;; + main*) + releaseStatus=Alpha + ;; + esac + supportType="Short Term Support" + fi update_version done diff --git a/versions.json b/versions.json index 0551e54..b469b44 100644 --- a/versions.json +++ b/versions.json @@ -115,7 +115,7 @@ "milestone": "11.5", "version": "11.5.1", "fullVersion": "1:11.5.1+maria~ubu2404", - "releaseStatus": "RC", + "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:noble", "arches": [ @@ -129,6 +129,34 @@ "milestone": "11.5", "version": "11.5.1", "fullVersion": "11.5.1", + "releaseStatus": "Stable", + "supportType": "Short Term Support", + "base": "ubi9", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] + }, + "11.6": { + "milestone": "11.6", + "version": "11.6.0", + "fullVersion": "1:11.6.0+maria~ubu2404", + "releaseStatus": "RC", + "supportType": "Short Term Support", + "base": "ubuntu:noble", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] + }, + "11.6-ubi": { + "milestone": "11.6", + "version": "11.6.0", + "fullVersion": "11.6.0", "releaseStatus": "RC", "supportType": "Short Term Support", "base": "ubi9", -- GitLab