From c5aaba5e3282b30e4782f2b5d6e4e362e22dfcb7 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@ibm.com>
Date: Fri, 12 Jul 2024 16:12:01 +0200
Subject: [PATCH] build squid release by default

These changes will make the project build Ceph Squid by default in
addition to quincy, reef and main

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
---
 .github/workflows/container.yml           | 2 --
 Makefile                                  | 1 +
 contrib/build-push-ceph-container-imgs.sh | 2 +-
 contrib/ceph-build-config.sh              | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 9c5743dec..d68bb0ed9 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -7,8 +7,6 @@ jobs:
         os: [9]
         ceph_release: [quincy, reef, squid, main]
         exclude:
-          - os: 9
-            ceph_release: squid
           - os: 9
             ceph_release: quincy
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 20bcf8321..4e417c0f7 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@
 FLAVORS ?= \
 	quincy,centos,9 \
 	reef,centos,9 \
+	squid,centos,9 \
 	main,centos,9
 
 TAG_REGISTRY ?= ceph
diff --git a/contrib/build-push-ceph-container-imgs.sh b/contrib/build-push-ceph-container-imgs.sh
index 980d91d39..391f05582 100644
--- a/contrib/build-push-ceph-container-imgs.sh
+++ b/contrib/build-push-ceph-container-imgs.sh
@@ -51,7 +51,7 @@ OSD_FLAVOR=${OSD_FLAVOR:=default}
 
 if [ -z "$CEPH_RELEASES" ]; then
   # NEVER change 'main' position in the array, this will break the 'latest' tag
-  CEPH_RELEASES=(main quincy reef)
+  CEPH_RELEASES=(main quincy reef squid)
 fi
 
 HOST_ARCH=$(uname -m)
diff --git a/contrib/ceph-build-config.sh b/contrib/ceph-build-config.sh
index 687aa1a55..6918578a2 100644
--- a/contrib/ceph-build-config.sh
+++ b/contrib/ceph-build-config.sh
@@ -13,8 +13,8 @@ trap 'exit $?' ERR
 # These build scripts don't need to have the aarch64 part of the distro specified
 # I.e., specifying 'luminous,centos-arm64,7' is not necessary for aarch64 builds; these scripts
 #       will do the right build. See configurable CENTOS_AARCH64_FLAVOR_DISTRO below
-X86_64_FLAVORS_TO_BUILD="${X86_64_FLAVORS_TO_BUILD:-pacific,centos,8 quincy,centos,8 reef,centos,8}"
-AARCH64_FLAVORS_TO_BUILD="${AARCH64_FLAVORS_TO_BUILD:-pacific,centos,8 quincy,centos,8 reef,centos,8}"
+X86_64_FLAVORS_TO_BUILD="${X86_64_FLAVORS_TO_BUILD:- quincy,centos,9 reef,centos,9 squid,centos,9}"
+AARCH64_FLAVORS_TO_BUILD="${AARCH64_FLAVORS_TO_BUILD:- quincy,centos,9 reef,centos,9 squid,centos,9}"
 
 # Allow running this script with the env var ARCH='aarch64' to build arm images
 # ARCH='x86_64'