From 4e397bbc7ff93e76025ef390087dfcea05ef676e Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Fri, 15 Dec 2023 12:33:27 -0800 Subject: [PATCH] Revert "squid: Update contrib/ceph-build-config.sh with the release name" This reverts commit 7ba35c598faa324c63f772e3b3ed3b5a8d5db9b9. We don't yet have released squid packages. Wait to change the default flavors to build (the Jenkins container-build-and-push job uses the defaults set here). Signed-off-by: Dan Mick --- contrib/ceph-build-config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ceph-build-config.sh b/contrib/ceph-build-config.sh index d1ddf6492..580ad5fd7 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="pacific,centos,8 quincy,centos,8 reef,centos,8 squid,centos,8" -AARCH64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8 squid,centos,8" +X86_64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8" +AARCH64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8" # Allow running this script with the env var ARCH='aarch64' to build arm images # ARCH='x86_64'