container/build.sh: FROM_IMAGE=rockylinux-10 default for >=tentacle

We build centos9 and rocky10 packages and containers by default now for wip, main, and tentacle branches as of https://github.com/ceph/ceph-build/pull/2557.

Starting with tentacle, we want a `podman pull quay.ceph.io/ceph-ci/ceph:tentacle` or `podman pull quay.ceph.io/ceph-ci/ceph:$SHA1` to get the container with Rocky 10 as the Base OS image, or FROM_IMAGE.

Fixes: https://tracker.ceph.com/issues/75673
Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/container/build.sh b/container/build.sh
index 438926054d2687525ab50499f1a86c3e2fb65332..40ec4a4d3cff3104c26debe6980d31d9d5bf6143 100755 (executable)
--- a/container/build.sh
+++ b/container/build.sh
@@ -173,12 +173,20 @@ if [[ ${CI_CONTAINER} == "true" ]] ; then
         branch_repo_tag=${repopath}:${BRANCH}
         sha1_repo_tag=${repopath}:${CEPH_SHA1}
     fi
-    # while we have more than just centos9 containers:
-    # anything that's not gets suffixed with its fromtag
-    # for the branch and sha1 tags (for example, <branch>-rocky-10).
-    # The default can change when it needs to.
-
-    if [[ "${fromtag}" != "centos-stream9" ]] ; then
+    # The container build tooling is capable of using CentOS 9 and Rocky 10
+    # as the FROM_IMAGE base container images.
+    # In Tentacle, the default/preferred FROM_IMAGE changed to rockylinux-10.
+    # So we want `podman pull quay.ceph.io/ceph-ci/ceph:tentacle` to get the
+    # FROM_IMAGE=rockylinux-10 container, NOT the CentOS 9 one.
+    # And vice versa for ceph:squid.
+
+    if [[ "$BRANCH" == "reef" || "$BRANCH" == "squid" ]]; then
+        default_fromtag="centos-stream9"
+    else
+        default_fromtag="rockylinux-10"
+    fi
+    # We set fromtag above by extracting FROM_IMAGE from `podman inspect`
+    if [[ "${fromtag}" != "${default_fromtag}" ]] ; then
         branch_repo_tag=${repopath}:${BRANCH}-${fromtag}
         sha1_repo_tag=${repopath}:${CEPH_SHA1}-${fromtag}
     fi