Remove custom c9 __DOCKERFILE_INSTALL__; use generic version

The c9 version didn't get the prerelease changes for ceph-release,
so something was necessary to add them; besides that, the only
differences were the old method of selecting ganesha for later
releases and the enablement of crb instead of powertools in the
last line. Since we already had code to test centos8 in
daemon-base/__DOCKERFILE_INSTALL__, one more small conditional
won't hurt.

Also add the projectname (ceph) to the prerelease path (since
ceph-build's sync-push tool now adds it).  This affects
the __DOCKERFILE_INSTALL_ as well as contrib/ceph-build-config.sh

Signed-off-by: Dan Mick <[email protected]>

ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__

@@ -2,10 +2,7 @@ yum install -y epel-release && \
 yum install -y jq && \
 bash -c ' \
   if [ -n "__GANESHA_PACKAGES__" ]; then \
-    if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \
-      ARCH=$(arch); if [[ "${ARCH}" == "aarch64" ]]; then ARCH="arm64"; fi ; \
-      curl -s -L "https://shaman.ceph.com/api/repos/nfs-ganesha/V5.7/latest/centos/__ENV_[DISTRO_VERSION]__/flavors/ceph_main/repo?arch=${ARCH}" -o /etc/yum.repos.d/ganesha.repo ; \
-    elif  [[ "${CEPH_VERSION}" == squid ]]; then \
+    if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \
       echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
       echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
       echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \
@@ -113,5 +110,8 @@ bash -c ' \
     yum copr enable -y tchaikov/python-scikit-learn ; \
     yum copr enable -y tchaikov/python3-asyncssh ; \
     yum copr enable -y ceph/grpc ; \
-  fi ' && \
-yum install -y --setopt=install_weak_deps=False --enablerepo=powertools __CEPH_BASE_PACKAGES__
+    TOOLS_REPO=powertools ; \
+    yum install -y --setopt=install_weak_deps=False --enablerepo=powertools __CEPH_BASE_PACKAGES__ ; \
+  else \
+    yum install -y --setopt=install_weak_deps=False --enablerepo=crb __CEPH_BASE_PACKAGES__ ; \
+  fi'

contrib/ceph-build-config.sh

@@ -376,6 +376,7 @@ function get_latest_full_semver_tag () {
   # For searching full versions, always use 'v<major>.<minor>.<bug>-' including the dash so that a
   # search for 'v1.1.1' doesn't return 'v1.1.11' for example
   if [ -n "${TEST_RUN:-}" ]; then
+    # date %Y%m%d
     local build_num ; build_num="$(generate_new_build_number)"
     build_num=$((build_num - 1))
     if [[ $repository =~ .*amd64.* ]]; then